OSDN Git Service

Merge "Fix build" into nyc-dev am: 7c80241
authorJulia Reynolds <juliacr@google.com>
Thu, 17 Mar 2016 19:32:36 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Mar 2016 19:32:36 +0000 (19:32 +0000)
commit9aa54154f92c01a3205d726160294831053d0f05
treefa182c6d8f9d00678ceb6ce12f037bc477346f7d
parent21936f55544f411b07017d90f441a64d8a517171
parentf9c21c28a3928bb28ebd46eb0e2cf288b4ac4e05
Merge "Fix build" into nyc-dev am: 7c80241
am: f9c21c2

* commit 'f9c21c28a3928bb28ebd46eb0e2cf288b4ac4e05':
  Fix build