tree 0a8afa4909cc41fb8d3b9055e585aad96507336f
parent d9689beb7fce225abbaa78063d46717ec92b19fd
parent c8871a4082a8e9cc59daf8e649688acd2b150fcd
author Jean-Baptiste Queru <jbq@google.com> 1336004281 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336004281 -0700

am c8871a40: Merge "Tweaks for forward-compatibility"

* commit 'c8871a4082a8e9cc59daf8e649688acd2b150fcd':
  Tweaks for forward-compatibility