| commit | bc75782060da11b286ad1d492e2eb6b3d47898bb | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Jun 28 11:54:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 28 11:54:54 2012 -0700 |
| tree | e2f180907114194a602aa27b813872d028a0f0d3 | |
| parent | a2efe4359c538aec0a3d36b49b56e41bdf0a297a [diff] | |
| parent | 615f4cf22c0685035433fcf3b849c4b0ef9cc948 [diff] |
am 615f4cf2: (-s ours) am 9aa2d2a5: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '615f4cf22c0685035433fcf3b849c4b0ef9cc948': Import translations. DO NOT MERGE