summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-11-26 15:08:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-26 15:08:47 +0000
commit38499cf8a129b15fd526d45aad96657d96235abf (patch)
treee0842f6b722965235ab62cf48eac8b9fe93b96ff /core/java/android
parent441d4f04d1e7a3223449add1c70d9d2831277d0e (diff)
parentb82f42a139203f5957094b1a3c71c8cfa5914f49 (diff)
downloadframeworks_base-38499cf8a129b15fd526d45aad96657d96235abf.zip
frameworks_base-38499cf8a129b15fd526d45aad96657d96235abf.tar.gz
frameworks_base-38499cf8a129b15fd526d45aad96657d96235abf.tar.bz2
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions