| commit | ec5fb8e9474e4fb69c8643d67eeab53514835bfc | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Jun 26 17:04:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 26 17:04:49 2014 +0000 |
| tree | fae0b696f025330ffe5301bafd630fc7f8f120c8 | |
| parent | 6e36644b5516f69abed9d77549116863ea4a38aa [diff] | |
| parent | 1634e49edffc0517356d2a875f0226169c8a69b0 [diff] |
am 1634e49e: (-s ours) am 9cd24101: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '1634e49edffc0517356d2a875f0226169c8a69b0': Import translations. DO NOT MERGE