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:11:43 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:11:43 +0000 (22:11 +0000)
commitae07650724a08c1b999b8f9a12fdde8151faff28
tree44dee63360ed2e3ec1b7aedd469601f3fb8d1c4c
parent3099a7f79426f03b06f22ec37d512ff1b3e53d72
parent57f1af6a0be2856d87a11acdcc517699483f4965
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours am: 6fee9a5e91 am: ade8640d4d
am: 57f1af6a0b

Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999