OSDN Git Service

[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd192418...
authorCheney Ni <cheneyni@google.com>
Sat, 11 Aug 2018 00:11:22 +0000 (17:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 11 Aug 2018 00:11:22 +0000 (17:11 -0700)
commit3d14101b52cf057bfa7d80f8ebd2e23512b82f9f
treea827f64f20288582c9bc10537eb2089f764d81d8
parenta2d197761765bc126a03909a3bb3ece7fcf9809a
parent1718736f85d329f48162864135b4fc353a5912b4
[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd1924189" into oc-dev
am: 1718736f85  -s ours

Change-Id: Id71e8b3945f0d2051c2b642c6ed83c293f5d31fb