OSDN Git Service

Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:25:09 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:25:09 +0000 (01:25 +0000)
am: 22e7d2ed20

Change-Id: I6b0a8e3c2831933199c8cb55ce8c666e8db186e3


Trivial merge