OSDN Git Service

Merge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into oc-dev
authorAjay Panicker <apanicke@google.com>
Mon, 12 Feb 2018 19:20:20 +0000 (19:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Feb 2018 19:20:20 +0000 (19:20 +0000)
commit9174514369752e39af960416c036cf0c6d4fb00b
treecbb2dfdde7d5594c46b95bba4fb70986d14350b6
parent8464a40d75e801d8e99da0f2d27ac56a2457c0f4
parent142e752125c21e217cae1147977db71b5248c2dc
Merge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into oc-dev
am: 142e752125

Change-Id: I097d61047d05db7daf8d4142f0a57fa8536fa806