| commit | f9c1a70d2e528f9ce9e3849f78e6ca4861bb2dfe | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jun 23 19:49:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:49:58 2014 +0000 |
| tree | b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60 | |
| parent | 2635a3fcc37ee5a2b33ff2a1f593247b9f7fa4c0 [diff] | |
| parent | 87ff23f3f5338518c607f47e347a384738ca6595 [diff] |
am 87ff23f3: (-s ours) am 3e6f65be: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '87ff23f3f5338518c607f47e347a384738ca6595':