OSDN Git Service

[automerger skipped] Merge changes into stage-aosp-master
authorchen xu <fionaxu@google.com>
Mon, 15 Oct 2018 23:08:29 +0000 (16:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 23:08:29 +0000 (16:08 -0700)
commit12f59370da21237a83c78fdf337ffb528bfafd68
tree69f3ddcc66ec15f507cc8f101d9b3508da15a856
parent6ea046e734be5d1c90a808f0d430790a9b89a6cb
parent25cdce89f4f37450d951a5456b16794a45af7e85
[automerger skipped] Merge changes  into stage-aosp-master
am: 25cdce89f4  -s ours

Change-Id: I00a27b03ba4c0061bce8c21940abb517aecdc48f