| commit | c3b068d627016195a24bd669070e030a5a9d9df1 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Jun 05 12:25:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 05 12:25:36 2012 -0700 |
| tree | 2208f39a8db2e3f27d3cc8c604922b619b7d6798 | |
| parent | 3c61e37e7cd6118bc8835ea16597162c2a8a00e9 [diff] | |
| parent | cc9da2a5704a3b76027eac8a20ff2c1de407a9f9 [diff] |
am cc9da2a5: (-s ours) am 49661d3f: Import translations. DO NOT MERGE * commit 'cc9da2a5704a3b76027eac8a20ff2c1de407a9f9': Import translations. DO NOT MERGE