OSDN Git Service

Merge changes I93cf24d4,I32e438ef
authorDan Willemsen <dwillemsen@google.com>
Sun, 10 Sep 2017 01:44:06 +0000 (01:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 10 Sep 2017 01:44:06 +0000 (01:44 +0000)
commitc28d591b36556a6109a1bbf8a2fc51a28aa46d9c
tree5e347c769b98259ca3d8b8d2e4ed34eb59db6cf4
parent972a9d531803a8bdf9cdd114bedaa1ef776128e7
parent30798ad13a379e9d226c35d7417a16f690b9dbf0
Merge changes I93cf24d4,I32e438ef
am: 30798ad13a

Change-Id: I0b178c8523d0c5829d731f6ed05cfa3fe89ad9b4
Android.bp