OSDN Git Service

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 00:58:05 +0000 (00:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 00:58:05 +0000 (00:58 +0000)
commit0666f394b584fd30b0cda9c152b0ca11b62709ba
tree2e9bca65ddf2de1562875ea9e9c548e1bf3fde4f
parent587467249a98847c8a4e8b6e734bf5420466e522
parent7aaec13b055b5fe914d9448a618193e33a476a4a
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec am: 1faf81da83
am: 7aaec13b05

Change-Id: If54ff20342b55d7c748472471993be43cd492196