| commit | ce4bce00eb0ef282ebea715dc7cdc7fafce3f84b | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Feb 02 13:51:26 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 02 13:51:26 2012 -0800 |
| tree | a5afcdafc3b35472626af8eb72bba772cdb6eafb | |
| parent | f20d3cc11bd2a393f7065c4c2985b0e52ffc23c7 [diff] | |
| parent | 201a77ea399527da0f69faf14cc26162909f43c7 [diff] |
am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE * commit '201a77ea399527da0f69faf14cc26162909f43c7': Import translations. DO NOT MERGE