summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-27 22:14:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 22:14:24 +0000
commit7e90512771943c2b87d96bba8a90e80eb26c65a7 (patch)
tree15077888a74562055e0d891a898f92b27adfec6e
parent587e420ea9fb5578985e32d31b8791e773a5861e (diff)
parentde11c26060d0ed58ea40cefa2e45b7a14fb65d36 (diff)
downloadframeworks_base-7e90512771943c2b87d96bba8a90e80eb26c65a7.zip
frameworks_base-7e90512771943c2b87d96bba8a90e80eb26c65a7.tar.gz
frameworks_base-7e90512771943c2b87d96bba8a90e80eb26c65a7.tar.bz2
am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'de11c26060d0ed58ea40cefa2e45b7a14fb65d36': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions