OSDN Git Service

Merge changes from topic "am-8746f172-81c8-4cc5-8040-4c8a62f52edd" into oc-dev
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 13 Jul 2018 09:30:59 +0000 (02:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 09:30:59 +0000 (02:30 -0700)
am: 1cf96b6d8f

Change-Id: Ice288c4814e0ca8e48a625bb2af43121b4a9336b


Trivial merge