tree 9e290322e8709157cd2b47ed597234fee0fae5a1
parent 4ae631f4560d383c28767641bb7e9e47ab175c7f
parent 47e63bb4e471a2b6ed0a3c20f386668809452840
author Jean-Baptiste Queru <jbq@google.com> 1343409288 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343409288 -0700

am 47e63bb4: Merge "Fix build."

* commit '47e63bb4e471a2b6ed0a3c20f386668809452840':
  Fix build.