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