| commit | 2af3fc327552fed412a583e72d0969aa2d5b6e4d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:16:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:16:14 2014 +0000 |
| tree | 83d386ee7a2edfd541e0c88f8f044c4bcd3c9334 | |
| parent | 28b90dce0b5187c593248eef049cd588088e63c0 [diff] | |
| parent | 25b6185d1cd26f91ee417906714fa6ceb9fb8705 [diff] |
am 25b6185d: (-s ours) am 19eefc51: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '25b6185d1cd26f91ee417906714fa6ceb9fb8705': Import translations. DO NOT MERGE