commit | 54ff084bbf3ae85e6454aff22f8c16570066ec52 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Mar 25 20:47:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 20:47:10 2014 +0000 |
tree | 31e22746cd36c2f4b87e73c58753b18d63a31669 | |
parent | 1571297dab31aba920d93d1f66e228b86ba5abb4 [diff] | |
parent | 1ec23cf662852ad1735f0678453225a7fe55004f [diff] |
am 1ec23cf6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '1ec23cf662852ad1735f0678453225a7fe55004f': Import translations. DO NOT MERGE