tree 36db0270382f8158b5989078e46e819cd26e6d10
parent 62bcdc699965e86196b7c4cf3d8680dfe3839b0c
parent f6067133f37c4b3f7ec653032b1432506be758fd
author Jean-Baptiste Queru <jbq@google.com> 1345242384 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345242384 -0700

am f6067133: am 5f421caf: (-s ours) am c2ad1992: Merge "Forward-compatibility stubs"

* commit 'f6067133f37c4b3f7ec653032b1432506be758fd':
  Forward-compatibility stubs