OSDN Git Service

[automerger skipped] Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad...
authorMihai Popa <popam@google.com>
Wed, 15 Aug 2018 20:04:26 +0000 (13:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Aug 2018 20:04:26 +0000 (13:04 -0700)
am: fc28b6b724  -s ours

Change-Id: I74179d805d746ccbb32546fb268cb52c8c9db514


Trivial merge