OSDN Git Service

Merge changes I52c156ed,I9fb9a924 into oc-dev
authorNingyuan Wang <nywang@google.com>
Fri, 14 Apr 2017 00:24:33 +0000 (00:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 00:24:33 +0000 (00:24 +0000)
am: e3c0b02d33

Change-Id: I8dd4fb4a04d116ca0d20c8bb69cb36e6a97636eb


Trivial merge