| commit | be2cca33b9ed3d2e5cf6f21c31aa5cb5addba7da | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 03 22:04:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 03 22:04:57 2013 -0700 |
| tree | 8b14a131926a1c4deb1140f90a4771d23a592fce | |
| parent | ba84f2db482cd0444237ea13a85b54ae3eaf3dba [diff] | |
| parent | 538f03a2857c1b40663c597cd85368a21b628263 [diff] |
am 538f03a2: (-s ours) am c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '538f03a2857c1b40663c597cd85368a21b628263': Import translations. DO NOT MERGE