OSDN Git Service

[automerger skipped] Merge changes into stage-aosp-master am: 25cdce89f4 -s ours
authorchen xu <fionaxu@google.com>
Mon, 15 Oct 2018 23:24:22 +0000 (16:24 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 23:24:22 +0000 (16:24 -0700)
commit83c1bfa4e37aae8b769548118403f267e349125b
tree7e3e8f14680557fb52cc139e6edc4a147a8462d1
parentb947cdabe9ab35780117d2c4eebfc6a243a4043f
parent12f59370da21237a83c78fdf337ffb528bfafd68
[automerger skipped] Merge changes  into stage-aosp-master am: 25cdce89f4  -s ours
am: 12f59370da  -s ours

Change-Id: I22fe06c9597a6e62239b1871ce63f43e6b44ea3a