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)
commit4cf0bfe0b796bcff6b9b0f051f8bbb4dcfc016d2
treebc9739e2f22d9fb4753766ce26ee44f808d5cd71
parent489a931022a69b74d5801b0c0047f9693fabf579
parente3c0b02d33b6a28e3a78d9258670b35dcb6fd8ed
Merge changes I52c156ed,I9fb9a924 into oc-dev
am: e3c0b02d33

Change-Id: I8dd4fb4a04d116ca0d20c8bb69cb36e6a97636eb