OSDN Git Service

Merge changes I8953967a,If17eddad into oc-dev am: b8abd8d867
authorJason Monk <jmonk@google.com>
Thu, 20 Apr 2017 18:30:04 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 18:30:04 +0000 (18:30 +0000)
am: 68da249054

Change-Id: I4765886cec83980a59000a077e927cb480420e3c


Trivial merge