summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-27 22:33:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 22:33:24 +0000
commit2e6f1b34cd5af8100c316c043d485ceac2928448 (patch)
tree514717c5de09d32b2144062eb7321c9c528ed0b7
parent19fccb2d850b2973d35a14e5cf1c977204fe6737 (diff)
parentb5853c74531cac635cb888185129093a8dee7b1a (diff)
downloadframeworks_base-2e6f1b34cd5af8100c316c043d485ceac2928448.zip
frameworks_base-2e6f1b34cd5af8100c316c043d485ceac2928448.tar.gz
frameworks_base-2e6f1b34cd5af8100c316c043d485ceac2928448.tar.bz2
am b5853c74: (-s ours) am 7e905127: (-s ours) am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'b5853c74531cac635cb888185129093a8dee7b1a': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions