OSDN Git Service

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)
commitb019e2c469d435c8a5736f2e609b9c1d1fd22175
tree357970b1961732706d22afbae4b164ef39e01a78
parent1faf81da83b1f3d68c2333ea7cffca7ec3277b30
parent4fc6cbfa6a41e5d4ea26292cd4e1946a3a96eac6
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
am: 4fc6cbfa6a  -s ours

Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2