diff options
| author | Eric Fischer <enf@google.com> | 2012-06-12 13:00:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 13:00:08 -0700 |
| commit | 830dfe41d164184741cc9f446d3fb6c39987469e (patch) | |
| tree | 41e8686324fd86098b508084fdd16b27f920e465 /tools | |
| parent | 7c727e50f1a73d6fab100af9cac3e16985aa18a2 (diff) | |
| parent | 19e046c4d2f11e6ed5d324122996080942e94569 (diff) | |
| download | frameworks_base-830dfe41d164184741cc9f446d3fb6c39987469e.zip frameworks_base-830dfe41d164184741cc9f446d3fb6c39987469e.tar.gz frameworks_base-830dfe41d164184741cc9f446d3fb6c39987469e.tar.bz2 | |
am 19e046c4: (-s ours) am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '19e046c4d2f11e6ed5d324122996080942e94569':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions