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:57:24 +0000 (20:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:57:24 +0000 (20:57 +0000)
commit2e2e6fcc0430dd3f41e3d387255744d073659dca
tree68fc394042be9822f44ff411a3851963b2f219f5
parent8870bd7c5af93ac0c04891a0ec28da62d41171b8
parent85aa9ccc69bc86d202f0f550537ba4c6681c480c
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e
am: 85aa9ccc69

Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6