OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE" am: c5db7f8f22 -s ours
authorXin Li <delphij@google.com>
Mon, 10 Dec 2018 18:54:04 +0000 (10:54 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Dec 2018 18:54:04 +0000 (10:54 -0800)
commit5c89000180637f4df9e85bba0c804ee824c470bc
tree32a93f736cab50c6438c6442097bf039e49a9549
parent35df572f85b1ffffecddb130fb3f6d75c72c4f18
parentafa87d5e953bc35a73a2c2d6d7c99ea2235c771e
[automerger skipped] Merge "DO NOT MERGE" am: c5db7f8f22  -s ours
am: afa87d5e95  -s ours

Change-Id: I4c4a9d31347325a7744e1bd69832d901c6cefe58