| commit | 187e292dd6a7e49edd6953261c443a73dabea1cd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 26 12:17:52 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 12:17:52 2013 -0700 |
| tree | 1435239223e015ea882f78c9bc255b3bf54dce5e | |
| parent | 2f96e6c12b49dcb15a3d2809c8e62348295c266e [diff] | |
| parent | 3d4a08c854b0c9cb286cc493d24ee52994d3de64 [diff] |
am 3d4a08c8: (-s ours) am e7902c4f: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '3d4a08c854b0c9cb286cc493d24ee52994d3de64': Import translations. DO NOT MERGE