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)
am: 575726487f

Change-Id: I0b218cc9a6820380b8e32ea0e020d39929a42826


Trivial merge