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:08:56 +0000 (21:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:08:56 +0000 (21:08 +0000)
commit84c5bd8a5a550a545af1e29b937004d23f4cb1b9
tree9558f45c9b6c24d3b3d7b97c3eb647a470b91981
parent0038e448e150a5c31196452ed80b280075469fe1
parent702d130b13a09fb4a9c61768bb0c690afd86a5bd
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: e8f916bf97
am: 702d130b13

Change-Id: I385c7679197c6ac29910fdc15d911df682a950c1