| commit | 51c7ac160452e995ce797f7c0c34df2f28e996d0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:24:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:24:18 2014 +0000 |
| tree | 0058fd1a78994683a244210ed5996745329b84e9 | |
| parent | f1f49c189ed5896893dfb2584420f824d8fb54c2 [diff] | |
| parent | 0e7a3277134dbbb2d202ce7d8bc2cd93ef3e8a79 [diff] |
am 0e7a3277: (-s ours) am e5243941: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0e7a3277134dbbb2d202ce7d8bc2cd93ef3e8a79': Import translations. DO NOT MERGE