OSDN Git Service

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am...
authorBill Yi <byi@google.com>
Sun, 11 Nov 2018 04:12:56 +0000 (20:12 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 11 Nov 2018 04:12:56 +0000 (20:12 -0800)
am: 8c06bfb6a4

Change-Id: Ic8f5a84eac8899a07f504c450a549f6d0a6668d0


Trivial merge