OSDN Git Service

Merge changes Ic93ac4e9,I68a85138
authorChenbo Feng <fengc@google.com>
Thu, 29 Sep 2016 23:11:05 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 23:11:05 +0000 (23:11 +0000)
commit478f708bde19244b84532fac5289d421b196527b
treef24b6c6d2d3f24e89399758149f43b47bc55856a
parentbc6aecfdfe202091eae300d38b878a563842a56f
parentf63f3fde8e6821dd20808443e74f97cb5c76365c
Merge changes Ic93ac4e9,I68a85138
am: f63f3fde8e

Change-Id: I4f7b59d3ba7f0b386a103c12b118ed55d2fac390