OSDN Git Service

Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 21:06:27 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:06:27 +0000 (21:06 +0000)
commit254f21b65542e96892a4c4176fc3cda7290813ce
tree2e9bca65ddf2de1562875ea9e9c548e1bf3fde4f
parentc150df6f8eeb70bfa66d5f5d7ed881b964b82ca0
parentf7d3537fcd9037d26ada8de9766c5605c605f69c
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3
am: f7d3537fcd

Change-Id: If19362bb1a73a34b2783d6c1777aef37d7f8941e