OSDN Git Service

Merge changes Ic43d690d,Ifec6c320
authorDan Albert <danalbert@google.com>
Thu, 22 Sep 2016 17:49:24 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 17:49:24 +0000 (17:49 +0000)
am: 0855431067

Change-Id: Ib122da0020068de7e61282a15f67224709976024


Trivial merge