summaryrefslogtreecommitdiffstats
path: root/services/core/java
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-13 14:20:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-13 14:20:20 +0000
commit2bb933a5129cccb29e31fe2db00109bab6805979 (patch)
treed45ad6d965b2368aaf3b248fb193b28dcdc5f583 /services/core/java
parenta362bacb16d31b48e6cb7a59b40252137c899862 (diff)
parent862ecfa38a5df179bcacf7e5f0c8c2cfef994193 (diff)
downloadframeworks_base-2bb933a5129cccb29e31fe2db00109bab6805979.zip
frameworks_base-2bb933a5129cccb29e31fe2db00109bab6805979.tar.gz
frameworks_base-2bb933a5129cccb29e31fe2db00109bab6805979.tar.bz2
am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '862ecfa38a5df179bcacf7e5f0c8c2cfef994193': Import translations. DO NOT MERGE
Diffstat (limited to 'services/core/java')
0 files changed, 0 insertions, 0 deletions