OSDN Git Service

Merge changes I559eb049,I52425b84
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:18:07 +0000 (01:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:18:07 +0000 (01:18 +0000)
commit575726487f4adaa39149dc84688f4a17df9a3025
tree29e4a0180fc7287a4bd03f0c329af3a23ed57b98
parent2a913049abefa5ad6b5ee4ae36989296e1329139
parent60d10ea0f4cfcb7fcd3c6b188751368c3eeed591
Merge changes I559eb049,I52425b84
am: 60d10ea0f4

Change-Id: Ided0ebc7e0aaab0f88c2b0af7e3e99fa9e674a60