OSDN Git Service

Merge changes Ib6ffcc38,Ia58e6bc1 am: 3068a85962
authorDan Willemsen <dwillemsen@google.com>
Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)
am: 5da565a85a

Change-Id: Ib0c7157644c1d51f37b8c91c76adb35c2df00de6


Trivial merge