diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-10 21:59:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 21:59:33 +0000 |
| commit | 664effc8240250f0ad6e149f762b5bbc3ccd6abe (patch) | |
| tree | 124825374fa6bd53d980168d3fda571b4cfa8ca8 /core/java | |
| parent | 93cfdbe173861b72fea4e69d73d71e73df0cc515 (diff) | |
| parent | 71433a9047721e48d0f49b990dc921561c173e50 (diff) | |
| download | frameworks_base-664effc8240250f0ad6e149f762b5bbc3ccd6abe.zip frameworks_base-664effc8240250f0ad6e149f762b5bbc3ccd6abe.tar.gz frameworks_base-664effc8240250f0ad6e149f762b5bbc3ccd6abe.tar.bz2 | |
am 71433a90: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: e1bc1c6 -s ours
* commit '71433a9047721e48d0f49b990dc921561c173e50':
Import translations. DO NOT MERGE
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions