OSDN Git Service

Merge changes I559eb049,I52425b84 am: 60d10ea0f4 am: 575726487f
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:43:19 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:43:19 +0000 (01:43 +0000)
commitbb06be4c023f5fbe4c0eea6a99ba7b7f099a0d3f
tree9b77364894aa032d1f601949a5c9e8edb999ed34
parentb8e55cfbfe35f339e07698c87439f3d46873e206
parent5e4f253e6c1ac80126989e8ae6387f417c88d648
Merge changes I559eb049,I52425b84 am: 60d10ea0f4 am: 575726487f
am: 5e4f253e6c

Change-Id: I348f7bf72778409db883c4bc0a27ff49a351ce38