| commit | 3d4a08c854b0c9cb286cc493d24ee52994d3de64 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 26 10:58:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 10:58:08 2013 -0700 |
| tree | 6cf4deac21ad2f9b4520a8f59ba2b07dcf2d2b53 | |
| parent | ebd8ae3f676229b8c5a921c56c074d05ea5c3e32 [diff] | |
| parent | e7902c4f4c0755ad55af3ed680efa5027483abcf [diff] |
am e7902c4f: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'e7902c4f4c0755ad55af3ed680efa5027483abcf': Import translations. DO NOT MERGE