OSDN Git Service

[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00...
authorMihai Popa <popam@google.com>
Wed, 6 Jun 2018 16:33:57 +0000 (09:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 16:33:57 +0000 (09:33 -0700)
commitbb18c011aac9dddbda0919f89c48f0ca780a89b6
tree0db16e149e3f24f641ae7cbc354ba96c5d786c0c
parent4f74605d1120d28fc1ce9077054e6d8d0c2953db
parent3fce74a7f3c3c5f344e14465ae52e13694e0f4d1
[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into oc-dev
am: 3fce74a7f3  -s ours

Change-Id: I28ae4102fd8913d74e8dd928f286cbdbd66d0241