OSDN Git Service

Fix build breakage
authorJohn Reck <jreck@google.com>
Fri, 12 Dec 2014 15:28:39 +0000 (15:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Dec 2014 15:28:39 +0000 (15:28 +0000)
automerge: a7c24b4

* commit 'a7c24b439e54706566a6eba673d49152b18c654f':
  Fix build breakage


Trivial merge