OSDN Git Service

Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
authorRobin Lee <rgl@google.com>
Thu, 21 Apr 2016 19:22:35 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 19:22:35 +0000 (19:22 +0000)
commiteaad6d7fcc4e4382db58f2c76df29af0dcdc5cda
tree7021a5ab8a1c6a294f09648d96ef2ecd477b784d
parent04c7dc2424c775d7b4a3a7368a8e837b644c35d8
parent69f12b6e6f405ea0f8205efe11cddc5bb25c54dc
Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
am: 69f12b6e6f

* commit '69f12b6e6f405ea0f8205efe11cddc5bb25c54dc':

Change-Id: Id1f0ba90111b8f233a1444d8b97e1ab7c3f6eb2d