OSDN Git Service

Merge "Ran update-makefiles.sh." am: 891f6a946a am: 566c20bd49
authorYifan Hong <elsk@google.com>
Wed, 11 Jan 2017 00:09:26 +0000 (00:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 00:09:26 +0000 (00:09 +0000)
commita7841ef05fe295951f41ba5adc0eeaf64ad665e5
tree5d6ab90b5a79a08c5292634d40bbc0aa5cd46b0d
parent872ec4389cf6d40f365dc6d4585a4607a95a92d3
parent6daf36e01d0d20d7943c2f3c2a4775c15098b956
Merge "Ran update-makefiles.sh." am: 891f6a946a am: 566c20bd49
am: 6daf36e01d

Change-Id: Ib6122b154dafcb12ff6e9dd9d9e8775a5ddbcbd0