OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE"
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Dec 2018 01:57:25 +0000 (17:57 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Dec 2018 01:57:25 +0000 (17:57 -0800)
commita09f89ac50db06c7c2a198dd13b38ed69690ba64
treef8aad05ea194737e6be6acfab5c5d8ce934f7c7f
parenta2aac739f23b4ea32a8029faab50b088029d1bba
parent13faf565ff6432dacddeab03aa6ec9ff78157803
[automerger skipped] Merge "DO NOT MERGE"
am: 13faf565ff  -s ours

Change-Id: I6a1e5432df10cca673f3c8cc0849c030ab40d291