OSDN Git Service

[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00...
authorMihai Popa <popam@google.com>
Wed, 6 Jun 2018 19:45:38 +0000 (12:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 19:45:38 +0000 (12:45 -0700)
am: 999d9e1bf0  -s ours

Change-Id: I92c4e0edf71e7f92400395af8aa2828bb9ab395f


Trivial merge