OSDN Git Service

[automerger skipped] Merge changes from topic "am-687d0d76-1eea-4aa7-85c2-727a2127c13...
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 13 Jul 2018 10:37:57 +0000 (03:37 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 10:37:57 +0000 (03:37 -0700)
commit093fd122e141e6c1f1bcd8554a3e86b046e063ca
treeccc00092ee2656e7b19ad453383e48ac9201877d
parentd8c44a86d07474925a5f0784683896f550e786dc
parentd82b5627f26e9c1b267149e460a607f410d56707
[automerger skipped] Merge changes from topic "am-687d0d76-1eea-4aa7-85c2-727a2127c13f" into oc-dev am: 2008b8b0f1  -s ours am: 2f2259ce16  -s ours
am: d82b5627f2  -s ours

Change-Id: I1e5065efe5d41ace502712ba9178a65273a98caf