OSDN Git Service

Merge changes from topic "am-ba736da7-b534-414b-a405-b0397951e24d" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Fri, 1 Jun 2018 00:02:27 +0000 (17:02 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 00:02:27 +0000 (17:02 -0700)
commit85b2e2e5b22e54b9412e9f236c199c6a94f5c002
tree4f8aac73b56d404a5f6cf5fba2a661d3c7d1cdaa
parente1360ee177ac566ef342a82dc1f9bac661b4d41a
parentc691f7a61d2dd25809154c92b1ccd057b7757e33
Merge changes from topic "am-ba736da7-b534-414b-a405-b0397951e24d" into oc-dev
am: c691f7a61d

Change-Id: I49cc66fae3e6bbd7de8589ad6de17d6a5a3e5399