commit | 8638481320f0d290e9d59e80ef76d4c401c3ce74 | [log] [tgz] |
---|---|---|
author | Kenny Guy <kennyguy@google.com> | Fri Mar 20 23:12:25 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:12:25 2015 +0000 |
tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
parent | 6544f08d344cd8ae88500bee0d3b9c4d7c25f1ba [diff] | |
parent | 73770f4f16f19b45dc8f01556bb3053eaa0c82dd [diff] |
am 73770f4f: am a5257b49: am bde60852: Merge "Change strings as per updated mocks." into lmp-dev * commit '73770f4f16f19b45dc8f01556bb3053eaa0c82dd':