tree ddbeb73fe7b47feee210abb25e74054500f71ff7
parent c6bbfb6e9b534b1e65a87912248f9236840063aa
parent a609ab4940a2a64224b35d7ae32d00ce4d9aee5f
author Michael Jurka <mikejurka@google.com> 1296432925 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296432925 -0800

am a609ab49: am cdda1cee: fix the build

* commit 'a609ab4940a2a64224b35d7ae32d00ce4d9aee5f':
  fix the build