OSDN Git Service

Merge changes Ie2676b20,Ie8db6f85
authorHugo Benichi <hugobenichi@google.com>
Thu, 14 Sep 2017 12:01:19 +0000 (12:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 12:01:19 +0000 (12:01 +0000)
am: 61901ddedd

Change-Id: Ib4fab32418da8274bd6b5cb9fef85e0db79d866a


Trivial merge