tree 5d434befc14cb3339197b9eddfe784cc434ea58e
parent 80adeb535f17331dedbbd200c99c366f34d33eeb
parent 4faeef378e9b82a4ad0fc1d4bb923af1a4f70e4e
author Brian Carlstrom <bdc@google.com> 1343928722 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343928722 -0700

am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"

* commit '4faeef378e9b82a4ad0fc1d4bb923af1a4f70e4e':
  Improve test key names to reproduce public issue