tree a403314e412cfc39869dea9e41096887e66b3a31
parent 88fd7a5082ebf964e9470a5f856081b27d887a28
parent 4c78d8620514fe1a704872cba66bc1b14d4e2a66
author Jean-Baptiste Queru <jbq@google.com> 1308586223 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308586223 -0700

am 4c78d862: am a08f7ae3: Merge "tweak for forward-compatibility"

* commit '4c78d8620514fe1a704872cba66bc1b14d4e2a66':
  tweak for forward-compatibility