OSDN Git Service

Merge changes Ic43d690d,Ifec6c320 am: 0855431067 am: 0a849b5d99 am: d8ad01dd60
authorDan Albert <danalbert@google.com>
Fri, 23 Sep 2016 00:11:27 +0000 (00:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 00:11:27 +0000 (00:11 +0000)
am: f4b80b2eb0

Change-Id: Ica0892e252c1b112f2efbae238d1515b73b294a4


Trivial merge