| commit | 8dcac6651bfeb2bdf4b9ff247bce1b6e7d15f55e | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 17 14:08:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 17 14:08:43 2012 -0700 |
| tree | e94b5442c6c84fc880021b8e1b375a2f6862ac55 | |
| parent | 858905f419c782a659f23e1630c70b95faeed0d8 [diff] | |
| parent | 166615f243dc170dbbae7e107634f92f05942015 [diff] |
am 166615f2: (-s ours) am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '166615f243dc170dbbae7e107634f92f05942015': Import translations. DO NOT MERGE