OSDN Git Service

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
authorEtan Cohen <etancohen@google.com>
Thu, 8 Feb 2018 06:13:44 +0000 (06:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Feb 2018 06:13:44 +0000 (06:13 +0000)
commitbeef47bfee47becd7186f2fc56e02ca6a40423e1
tree4726953f8b223653931d7cd8725b6faf327b41e7
parent03c97d0a92c2f788d85daa3c7df9a493101371ad
parent4839fb4abdc31a15a8fe7e01f7be0f2d82c61ae0
Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
am: 4839fb4abd

Change-Id: I330f9c4e3732d4655e294d6ad2c1ab120ce10b10