OSDN Git Service

Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 22:43:14 +0000 (15:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 22:43:14 +0000 (15:43 -0700)
commitdededea9f35c28c3025a612bf7a8b0102f012964
tree2aed0bda478eed87490ff8a5380d8b68f1c3094f
parent67892acff1cb4d594850b9150ff588f6e6ee1ea6
parent9b4f5525b481d22642dd6cd6c3afe8a6a9007144
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
am: 9b4f5525b4

Change-Id: I325923e835cf57736106da3ce8cc26aefa4ee3f7