| commit | 268370201064180efd7a156bca57cb869f74fdfe | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 30 13:48:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 13:48:25 2013 -0700 |
| tree | ae23c2cbf4ecbb3653722bc7f973eefc0c748a61 | |
| parent | 711cbd4cad2dd425d46bf1363283e501597b2e77 [diff] | |
| parent | e09e57c63528bf1ecacd0c534cc61aea396c9a9e [diff] |
am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '06e1da6cb8e53c0c4dc9267bdbaba3ea9c0d7c32':
