OSDN Git Service

Merge changes I70f79400,I2f8cab37 into oc-dev
authorAdrian Roos <roosa@google.com>
Wed, 5 Apr 2017 17:53:28 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 17:53:28 +0000 (17:53 +0000)
commitb298e4f87c03a30d192e063765fc29ecf00e2337
treecfe3bf16b9ae4299d5ddfe65509828b041597e2c
parent8bc68d70fe2a758adba565f7e1bd651605cf7fe3
parentbb790ca951541b3ddcc456d2a98a53522e90756e
Merge changes I70f79400,I2f8cab37 into oc-dev
am: bb790ca951

Change-Id: Ie5286397f0b0e28732e142d6cd31ccfd9d1c19a7