tree 521d2f3477424569c7fe266370258c8d1aa90e1f
parent 5a252a03852caad563d88f403e4ad2d05ed79423
parent 5820a99f3f843d718e80bc34bc4879144cce1efe
author Jean-Baptiste Queru <jbq@google.com> 1337300274 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337300274 -0700

am 5820a99f: Fix build

* commit '5820a99f3f843d718e80bc34bc4879144cce1efe':
  Fix build