| commit | b41f80c967555e5c7a4119bd4940aed73acbe440 | [log] [tgz] |
|---|---|---|
| author | Shubham Singh <coolsks94@gmail.com> | Wed Apr 05 00:51:48 2017 +0530 |
| committer | Shubham Singh <coolsks94@gmail.com> | Wed Apr 05 00:51:48 2017 +0530 |
| tree | 5e64a0d1ed31b1da3a5514726d5d31473039e583 | |
| parent | 8eca60f01e11cff14e63d9aba4d9ccc9752037d1 [diff] | |
| parent | 4478fa0ca242c565f363e190310acddb5d1f0731 [diff] |
Merge tag 'android-7.1.2_r4' into 7.x Android 7.1.2 Release 4 (N2G47H) Conflicts: src/com/android/contacts/common/util/AccountSelectionUtil.java