OSDN Git Service

Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Sat, 29 Sep 2018 00:22:01 +0000 (17:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Sep 2018 00:22:01 +0000 (17:22 -0700)
commit3bb25f8b87ffe5485c0a753f67eb07a6d1f6adbe
tree14b1d479bfa18a23c451515ddcfaf35d38a1f44d
parent3f2bc41d8bc808f2aec4527f6bc6359329dc9c0e
parent3262a5ad5f0c7f2c8f0c98770fc5499b2f7f241b
Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev
am: 3262a5ad5f

Change-Id: I148aeead42b1f969cb8ff5153d7d296e84b0f4a7