OSDN Git Service

[automerger skipped] Merge changes I3c14cfcf,I9d2ea66c,I9930105e am: 14540d9ceb
authorLogan Chien <loganchien@google.com>
Tue, 8 May 2018 05:49:20 +0000 (22:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 May 2018 05:49:20 +0000 (22:49 -0700)
am: b053bc0716  -s ours

Change-Id: I137a24f649b17abfba49d7f2f1d0a464d504aca4


Trivial merge