| commit | 75d928a1c0870a016b114e1c7e54757b51bdbe9c | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Jul 11 14:00:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 11 14:00:50 2012 -0700 |
| tree | fd4f3a2429565e1dabb491ecad2ee95ea16e3873 | |
| parent | 40cbdd2ae616121da2437b401a1b00679ac52884 [diff] | |
| parent | 0ddea75be44df61b4bde5d69340e071b39e54417 [diff] |
am 0ddea75b: (-s ours) am 04ca8e57: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '0ddea75be44df61b4bde5d69340e071b39e54417': Import translations. DO NOT MERGE