| commit | d84f4b737a0048d9ab63db84e2d056b1badb22b4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Sep 09 22:15:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 09 22:15:53 2013 -0700 |
| tree | db81ce08e16320504a44396fa3d200becc4506e7 | |
| parent | e578b1cdf5c2f30b4d9c9095ccb29a8ad734d338 [diff] | |
| parent | 97b1f619588f5def6bd0b78ba5b60d57e8d95d23 [diff] |
am 97b1f619: (-s ours) am c184ed76: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '97b1f619588f5def6bd0b78ba5b60d57e8d95d23': Import translations. DO NOT MERGE