OSDN Git Service

[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00...
authorMihai Popa <popam@google.com>
Wed, 6 Jun 2018 20:25:54 +0000 (13:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 20:25:54 +0000 (13:25 -0700)
am: 564fecfdb7  -s ours

Change-Id: I3a2d13dc94e3dbd5c7e30087e3fb3dcd4f02604f


Trivial merge