OSDN Git Service

Merge changes Ic93ac4e9,I68a85138 am: f63f3fde8e
authorChenbo Feng <fengc@google.com>
Thu, 29 Sep 2016 23:14:10 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 23:14:10 +0000 (23:14 +0000)
am: 478f708bde

Change-Id: I59c89d6da68db31886b885b955211ec105def375


Trivial merge