OSDN Git Service

[automerger skipped] Merge changes from topic "am-c709fe3e-1c07-4ecd-9998-2477e3445dd...
authorMihai Popa <popam@google.com>
Wed, 15 Aug 2018 19:52:34 +0000 (12:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Aug 2018 19:52:34 +0000 (12:52 -0700)
am: d5e6e1e83e  -s ours

Change-Id: Ie4fb9ca93c435f53cfe6db23b4902b094506b618


Trivial merge