| commit | 8f6bf733cfe815100b4e79b405c295d73fd36156 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 16 17:47:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 16 17:47:32 2012 -0800 |
| tree | 9f9bda762dac9a377a0467e61d810866ef471a9d | |
| parent | d931f14c9d88ddde3986c58d726f12d995b4823a [diff] | |
| parent | 4492cd965df364306e4d99939fc7aaf2f2a1c6d7 [diff] |
am 4492cd96: (-s ours) am 75d66ffe: am 3a3a84e4: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit '4492cd965df364306e4d99939fc7aaf2f2a1c6d7': Import translations. DO NOT MERGE