OSDN Git Service

Merge changes I193297e0,I43beb966 am: c729ff8253 am: 5dec1df23b -s ours
authorHugo Benichi <hugobenichi@google.com>
Sat, 24 Jun 2017 00:51:09 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Jun 2017 00:51:09 +0000 (00:51 +0000)
am: 050c95d679

Change-Id: Ic54e19a430fb16732197f289b46e5a3c8669d26f


Trivial merge