tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 7e1a3cff3b96222ebc9c905c82cee0a2ac8c798a
parent d4c37638b97a82847ff14ddab86f59d62f32fa74
author Sander Alewijnse <salewijnse@google.com> 1426893159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893159 +0000

am d4c37638: am 4defda96: am b6578e78: Update strings.

* commit 'd4c37638b97a82847ff14ddab86f59d62f32fa74':