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 20:52:25 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:52:25 +0000 (20:52 +0000)
commitba26fabe3ecf0ac72c1afebf40b8c1fe839c9dd9
tree57330f8d37f8f3b9322145d9a817b5db85d890c6
parent8bf67896d6796fe7054b210106730a9e36dd8b0c
parent91f4a42dac6851401dd76c4aabe7e501aa77c212
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671
am: 91f4a42dac

Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5