OSDN Git Service

Merge changes I59b6e04f,I55694d89
authorHugo Benichi <hugobenichi@google.com>
Thu, 26 Oct 2017 06:13:39 +0000 (06:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Oct 2017 06:13:39 +0000 (06:13 +0000)
am: 9009eabbfe

Change-Id: I217e32a7ab25fd73f3361015efae9bbbd1fde0f4


Trivial merge