OSDN Git Service

Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9
authorFan Zhang <zhfan@google.com>
Wed, 26 Apr 2017 10:55:34 +0000 (10:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 10:55:34 +0000 (10:55 +0000)
commit2e02794115948ffbf3c79fe6c9cdfee04326e63f
treef5641f14b94f9730b304b52045b78eb3cab28b5f
parent068ba85a7e675f75ccdb932690ad26bc96e7aeef
parent7d04b2dab08b4c2e6da9b17d42153950741c6c70
Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9
am: 7d04b2dab0

Change-Id: Ieece29f0f8488a9932aa96be6958430337df8d4e