OSDN Git Service

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
authorBill Yi <byi@google.com>
Sun, 11 Nov 2018 03:49:37 +0000 (19:49 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 11 Nov 2018 03:49:37 +0000 (19:49 -0800)
commit8c06bfb6a4160eda2b8ae98dbcb833e09bd0f04d
tree2ac7e942a9d6401b4132f938ec41a9a857647d62
parent0881f3bb255512bda9683bd0163a34d106f3cb49
parentbc7da75f8765d9cec03ef4b142e3739f486612d5
Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
am: bc7da75f87

Change-Id: Ibdf168a787a6208e78afce6ee311cfd84b198c4b