commit | 58072bc6161750fb214b1990422d9a0f883ac908 | [log] [tgz] |
---|---|---|
author | Shubham Singh <coolsks94@gmail.com> | Wed Apr 05 01:55:15 2017 +0530 |
committer | Shubham Singh <coolsks94@gmail.com> | Wed Apr 05 01:55:15 2017 +0530 |
tree | 64b46e4ee6045faf96ead7fb07d3efcca400d8ff | |
parent | c6ad6ba3bd3c58a1b778e0bfc3a62a56ef69e788 [diff] | |
parent | 971d02c0af79530b3d8be906476abfdbc563ba99 [diff] |
Merge tag 'android-7.1.2_r4' into 7.x Android 7.1.2 Release 4 (N2G47H) Conflicts: res/values-el/test_strings.xml src/com/android/bluetooth/btservice/RemoteDevices.java