| commit | 5b34567ba2fd1f60c9a277b0056828352100bdf8 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue May 29 12:09:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 29 12:09:23 2012 -0700 |
| tree | 90c536de4b7afdaa8adc8e57525649a9e3ba06f3 | |
| parent | fe39cb55712ae1f431bf6426297978914f1aa3e3 [diff] | |
| parent | 56b95290369c65e4552b9f38ee1de081760e2203 [diff] |
am 601a18b3: (-s ours) am cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '601a18b3d77a95e37585d051d8de2802bf3c84a4': Import translations. DO NOT MERGE