tree 111c65bc1b819f84e4553f311349b1a9be87ed54
parent bf731e7f905b0de85887d076867a499af640b5d1
parent 9f1ef6d57bbf1ac524eff849c8976acb012b5687
author Jean-Baptiste Queru <jbq@google.com> 1309209297 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309209297 -0700

am 9f1ef6d5: am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility"

* commit '9f1ef6d57bbf1ac524eff849c8976acb012b5687':
  Tweak for forward-compatibility