| commit | 06e1da6cb8e53c0c4dc9267bdbaba3ea9c0d7c32 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 09 12:31:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:31:23 2013 -0700 |
| tree | dbaff6cacdc3f7f0794d30e06d9064e22930dfe9 | |
| parent | e050261533ed4fff1c86a0553a5858e22d0305a9 [diff] | |
| parent | 79361f84cd616ee46b5522fd34ce27f948b5e701 [diff] |
am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '79361f84cd616ee46b5522fd34ce27f948b5e701':