OSDN Git Service

Merge changes I5187d17c,I49a76582 am: 7781a6d4c1 am: f2e5cf715d am: 31259c219f
authorHugo Benichi <hugobenichi@google.com>
Sat, 22 Apr 2017 01:07:59 +0000 (01:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 01:07:59 +0000 (01:07 +0000)
am: bcdf1214c7

Change-Id: I63b2fe14fe830b1000414328e79bee8c8233d40f


Trivial merge