| commit | d91763f34803311dabbae2ada610e9d0c58c2b0a | [log] [tgz] |
|---|---|---|
| author | B--B <dark.schneider.ds@gmail.com> | Wed Feb 22 23:55:05 2017 +0100 |
| committer | B--B <dark.schneider.ds@gmail.com> | Wed Feb 22 23:55:05 2017 +0100 |
| tree | 86933aafeafaa453059f75dcd95305da5b2e4a77 | |
| parent | 9fc0767d30fa86635ca202365fadd4c77035457a [diff] | |
| parent | d47661ad82d402c1e0c90eb83970687d784add1b [diff] |
Merge tag 'android-7.1.1_r22' into aosp-7.1.1 Android 7.1.1 Release 22 (NMF26X) Conflicts: src/com/android/contacts/common/util/AccountSelectionUtil.java