OSDN Git Service

am c70e89e2: Fix hybrid build
authorChris Craik <ccraik@google.com>
Tue, 3 Apr 2012 22:24:37 +0000 (15:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Apr 2012 22:24:37 +0000 (15:24 -0700)
* commit 'c70e89e2a024645d425b49db2bbf3f20ed68e518':
  Fix hybrid build


Trivial merge