OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am:...
authorFan Zhang <zhfan@google.com>
Tue, 28 Aug 2018 21:45:42 +0000 (14:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Aug 2018 21:45:42 +0000 (14:45 -0700)
commite8bf02f2562b2539e323d7807316ba7e1b970cfb
tree64576b30322ed7fb39524da47261711e986df783
parent9fe69d724d18f01c22a86ff93e6afa367f70ef4b
parent0e05005d8ddbec050064ffd507daf45bca995147
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am: 56cc4986df  -s ours
am: 0e05005d8d  -s ours

Change-Id: Ieb1b69c3fb1f42750044b49c270f4d533bbfb51b