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)
am: afa87d5e95  -s ours

Change-Id: I4c4a9d31347325a7744e1bd69832d901c6cefe58


Trivial merge