tree baf0057fbe1cc8e0b28e620342ec6cc87140db12
parent b0bd6024e344eb49702e24e78654f55254f42e8f
parent b06dfe142505df7efc729455f30ae73fa3cf6fae
author Jean-Baptiste Queru <jbq@google.com> 1308695193 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308695193 -0700

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

* commit 'b06dfe142505df7efc729455f30ae73fa3cf6fae':
  tweak for forward-compatibility