tree 8454e8f19851e584f55cb645b5a11025f02ca344
parent 7a33c87f8a0707852265eb0c834177545b050d34
parent b93ce4ae861f86eb86bc52a8444be7abd5f538d4
author Daniel Lehmann <lehmannd@google.com> 1313363091 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313363091 -0700

am b93ce4ae: Merge "Several API changes as requested by ES:"

* commit 'b93ce4ae861f86eb86bc52a8444be7abd5f538d4':
  Several API changes as requested by ES: