OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE"
authorXin Li <delphij@google.com>
Mon, 10 Dec 2018 17:51:00 +0000 (09:51 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Dec 2018 17:51:00 +0000 (09:51 -0800)
commitafa87d5e953bc35a73a2c2d6d7c99ea2235c771e
tree32a93f736cab50c6438c6442097bf039e49a9549
parent67f8aff2c43e22d99bed3d96984f587a3ea34c17
parentc5db7f8f228262f8acf483f61c9dc6ec32b2c8c5
[automerger skipped] Merge "DO NOT MERGE"
am: c5db7f8f22  -s ours

Change-Id: I0684ed2a838e3c68d2e4ec48707b09a400f0e642