diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-13 21:10:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 21:10:08 +0000 |
| commit | aba61dc19d6f1566ba153746cabd63e689735418 (patch) | |
| tree | 23d8f3f90972db7e5dd00b89dd89b9740024e0bc /core | |
| parent | 5e94e19c1fe0a4379348b392d5f2cbc52b304bb5 (diff) | |
| parent | 85e5c1968bf05c19307e5663c5b5afd062ca8753 (diff) | |
| download | frameworks_base-aba61dc19d6f1566ba153746cabd63e689735418.zip frameworks_base-aba61dc19d6f1566ba153746cabd63e689735418.tar.gz frameworks_base-aba61dc19d6f1566ba153746cabd63e689735418.tar.bz2 | |
am 85e5c196: (-s ours) am a81b1cad: (-s ours) am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '85e5c1968bf05c19307e5663c5b5afd062ca8753':
Import translations. DO NOT MERGE
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions