tree cbd66b3cfd1304dd38624ea5418a7164dd3bf64b
parent 1e6d4bd5fbb96509384a6b1e24b8d05b8e172abb
parent 287fa4082046062766332c7e50f7384f3e53eaff
author Michael Jurka <mikejurka@google.com> 1320967253 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320967253 +0000

am 287fa408: am 31234d81: fix build

* commit '287fa4082046062766332c7e50f7384f3e53eaff':
  fix build