tree d0da96bdf551817fa43f5091cd612393e0d5be25
parent 0964a13c8c8a0681d44721eee429169cc133b941
parent 5d962bb6bd51200d090a6f5c7256112eaffae44b
author Andrew Hsieh <andrewhsieh@google.com> 1391571166 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391571166 +0000

am 5d962bb6: Merge "Fixed apparent copy/paste mistake Bug: 11634373"

* commit '5d962bb6bd51200d090a6f5c7256112eaffae44b':
  Fixed apparent copy/paste mistake Bug: 11634373