| commit | b0697e2ae1d5d11e89143f94225723b5365cc4e9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 15:03:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 15:03:18 2015 +0000 |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d | |
| parent | 402337396297961700cbfea25aac046816d87340 [diff] | |
| parent | e3e11d6dac4b0ac43a9da028d1c0759081cbd425 [diff] |
am e3e11d6d: (-s ours) am e2c9b91f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'e3e11d6dac4b0ac43a9da028d1c0759081cbd425': Import translations. DO NOT MERGE