| commit | ff8fbf095665cf10922957d90317bc6319bbc3dd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:10:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 18:10:13 2013 -0700 |
| tree | b95a2c4beb6ab3a8660af77933357c0c75c82637 | |
| parent | bdd91eab5940515cb3a99b0c10b2d9863c249e4f [diff] | |
| parent | a5520e76911421956c7c4fe4e28ac60c64a276b9 [diff] |
am a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a5520e76911421956c7c4fe4e28ac60c64a276b9': Import translations. DO NOT MERGE