tree 9d4eaaaf0d3914bf19d4e07267246b00d894c9f2
parent d5a63fb6d763551b31f0dd9563ccc17e4652094b
parent 30ca089e04a091c4eea95d62185d120a61f0e0ba
author Jean-Baptiste Queru <jbq@google.com> 1364335622 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364335622 -0700

am 30ca089e: Merge "Tweaks for forward compatibility"

* commit '30ca089e04a091c4eea95d62185d120a61f0e0ba':
  Tweaks for forward compatibility