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