| commit | 5393ac023622a3dc7db92c723294d6f2ec96c0d2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 01 17:12:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:12:43 2015 +0000 |
| tree | 5a8bd43a0ce39786d8df3740bad02a991bb5fc0e | |
| parent | 3988dd5a6baa2d061da605aebd6f54566f51bbfa [diff] | |
| parent | ad44e83e0acb043e7069f7761300ce265adc6ba0 [diff] |
am ad44e83e: (-s ours) am 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'ad44e83e0acb043e7069f7761300ce265adc6ba0': Import translations. DO NOT MERGE