OSDN Git Service

[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00...
authorMihai Popa <popam@google.com>
Wed, 6 Jun 2018 16:33:57 +0000 (09:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 16:33:57 +0000 (09:33 -0700)
am: 3fce74a7f3  -s ours

Change-Id: I28ae4102fd8913d74e8dd928f286cbdbd66d0241


Trivial merge