tree 0eb9b92cf0723aa7f52c252075e9d3b26fae02f1
parent fc4215eec9b947628c3ab5b3707711d16da19120
parent 69e9c30c2641add74c9a3b02d0959c0ded9e66f7
author Jean-Baptiste Queru <jbq@google.com> 1329942846 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329942846 -0800

am 69e9c30c: Merge "Add stubs for improved compatibility"

* commit '69e9c30c2641add74c9a3b02d0959c0ded9e66f7':
  Add stubs for improved compatibility