tree 8924d31ff2ecb8b544ab35dab62f515aac397156
parent f5c477d4ea5fd9b7c995edf2fb829329fc79746f
parent f809d51518d91c644bd5b0701bb323c262df7246
author Yorke Lee <yorkelee@google.com> 1440674477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674477 +0000

am f809d515: (-s ours) am 3491ef06: Fix typo in string

* commit 'f809d51518d91c644bd5b0701bb323c262df7246':