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)
am: 5e4f253e6c

Change-Id: I348f7bf72778409db883c4bc0a27ff49a351ce38


Trivial merge