| commit | cab2a02aa7ca12f9c970a82b69a4cf41e6d07ff1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:16:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:16:07 2014 +0000 |
| tree | 83d386ee7a2edfd541e0c88f8f044c4bcd3c9334 | |
| parent | dba15396b8da4e729f3e2cb00eeab2a3ec176744 [diff] | |
| parent | 7fe0ea4218a2ca1c663076d8e52ffeb7d842ecc4 [diff] |
am 7fe0ea42: (-s ours) am f8de10ce: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '7fe0ea4218a2ca1c663076d8e52ffeb7d842ecc4': Import translations. DO NOT MERGE