commit | 471bc3dfce836128a9da34f00934d1dde7286b81 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 30 14:05:14 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:05:14 2013 -0700 |
tree | e4eab34b50299cabc52491e20d607f70acfb5fbf | |
parent | e3635597a9e9395c4a47e60c9fdd09beaf7747fc [diff] | |
parent | 268370201064180efd7a156bca57cb869f74fdfe [diff] |
am d07c572a: (-s ours) am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'd07c572a4e2b75bd27787020c31dcfe687245676':