| commit | e54300071ced0799e492a756acfabc8618a7e719 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:21:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:21:00 2014 +0000 |
| tree | 82501efc7b922bf746ba4dbe7a24c29a5bbd17c6 | |
| parent | 8832a1274886b9a5b4ca2305b6e973b171d995a1 [diff] | |
| parent | 28b90dce0b5187c593248eef049cd588088e63c0 [diff] |
am 28b90dce: (-s ours) am 971297e3: (-s ours) am 084de3c9: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '28b90dce0b5187c593248eef049cd588088e63c0': Import translations. DO NOT MERGE