diff options
author | Geoff Mendal <mendal@google.com> | 2015-02-23 14:39:07 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 14:39:07 +0000 |
commit | 19aff1e1fddb9fb09640a75d7429568add957905 (patch) | |
tree | e1d2a292a41ae8e91858b91b1730b36be9dc9f28 /packages | |
parent | ae576879b1ee4c93266f957efe5d14353fed91c1 (diff) | |
parent | 9dd645bdd0512456860a0fec66351dfed966b8c0 (diff) | |
download | frameworks_base-19aff1e1fddb9fb09640a75d7429568add957905.zip frameworks_base-19aff1e1fddb9fb09640a75d7429568add957905.tar.gz frameworks_base-19aff1e1fddb9fb09640a75d7429568add957905.tar.bz2 |
am 9dd645bd: (-s ours) am 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '9dd645bdd0512456860a0fec66351dfed966b8c0':
Import translations. DO NOT MERGE
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions