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

* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21':
  Tweaks for forward-compatibility
This commit is contained in:
Jean-Baptiste Queru 2011-06-20 09:14:31 -07:00 committed by Android Git Automerger
commit 0f0f4960f8

Diff Content Not Available