tree 11b1632b1221abb176b0116718068f9009a66167
parent aa01d1abefb1e90f6168617e47c4853201587b6a
parent 3eb3d2e31afcfca6d0cc54a1f60807da50e97965
author Jean-Baptiste Queru <jbq@google.com> 1332868781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332868781 -0700

am 3eb3d2e3: (-s ours) am acd30108: am d17c8977: am 0b6a436f: Merge "Fix build"

* commit '3eb3d2e31afcfca6d0cc54a1f60807da50e97965':
  Fix build