OSDN Git Service

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6c...
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 01:26:38 +0000 (01:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:26:38 +0000 (01:26 +0000)
commitf471234779b937599453e54022da5a48229a2c33
tree2e9bca65ddf2de1562875ea9e9c548e1bf3fde4f
parent6721c9306a74bf87c6cf2dc93eb849b1a08e25ab
parent072d4c282e1f944ced1f049df6004a767175c804
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a  -s ours am: b019e2c469
am: 072d4c282e

Change-Id: If13f37325685c98d796e24334f00e5ae9bc9a3b8