tree fcf60e712c8ec063d65d20af892cd7fd3e822c75
parent e2fc756f7d946da72991feeb8b569258f0b203eb
parent 75e3e4936bdcc9f7e717e14f530b9ac74ad81bd7
author Jean-Baptiste Queru <jbq@google.com> 1308586471 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308586471 -0700

am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility"

* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21':
  Tweaks for forward-compatibility