OSDN Git Service

Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)
commit57aa22c671ea953f8af92b10d9e07d4085a4a35d
treeb30d3f98e9edd4480b2fc425ac5bddf68333801d
parent24aaf4d7ad0b2920ee9a435d375182680ee90284
parent5d3967338d3bc1ab31f15ae9d90ee7fa3965b750
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780
am: 5d3967338d

Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c