OSDN Git Service

Merge changes I559eb049,I52425b84 am: 60d10ea0f4
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:29:11 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:29:11 +0000 (01:29 +0000)
commit5e4f253e6c1ac80126989e8ae6387f417c88d648
tree47220bfde379a4c7278a1f534a5702f0aecdd9c0
parentdebe4cea3916d9f01fe8591cd9974d0e17ad08bb
parent575726487f4adaa39149dc84688f4a17df9a3025
Merge changes I559eb049,I52425b84 am: 60d10ea0f4
am: 575726487f

Change-Id: I0b218cc9a6820380b8e32ea0e020d39929a42826