OSDN Git Service

Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91...
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 22:15:30 +0000 (22:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:15:30 +0000 (22:15 +0000)
commit3ae8ac091156b1346827e683187a55ea2dae3cf8
tree357970b1961732706d22afbae4b164ef39e01a78
parentce3fef5c99ab1d7250c8e685a8a454871e39035f
parentae07650724a08c1b999b8f9a12fdde8151faff28
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b
am: ae07650724

Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4