| commit | 69ee12342ab4606e64504f116c53271773b5a834 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 30 12:54:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:54:32 2014 +0000 |
| tree | 51cd24518b1e35875755d3f2a1b01d969afbd2d2 | |
| parent | e928594c059dc5c20bf30266a06b7e64a9585003 [diff] | |
| parent | 197af09e7c3b5369a42eec0bb031ee2d658a6e49 [diff] |
am 197af09e: (-s ours) am 864a1a6a: (-s ours) am e0fe275a: (-s ours) am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '197af09e7c3b5369a42eec0bb031ee2d658a6e49':