OSDN Git Service

Merge "Fix build" into nyc-dev
authorYorke Lee <yorkelee@google.com>
Wed, 23 Mar 2016 18:47:58 +0000 (18:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 18:47:58 +0000 (18:47 +0000)
commitabe553ed0d4bd4f268b70b4850525fb9895fb7f3
tree31d7c48416e3aac6319a57b3cdaa8c926c435464
parent0f0e2df40a2ff4537f430ee78ba08e6467e0fb4e
parentd0f8d9257b0b1076bbc5fa567fe98c2ae460a291
Merge "Fix build" into nyc-dev
am: d0f8d92

* commit 'd0f8d9257b0b1076bbc5fa567fe98c2ae460a291':
  Fix build
AndroidManifest.xml