summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-11-18 10:56:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-18 10:56:17 -0800
commit0076f4ac0f35814fed1613cae1120b3d954fe985 (patch)
tree7d846b53aaa51be4d2d815c15f3dfd4e0a062b46
parent51213d943b3931434cbd196a8a159ee325a4e3fc (diff)
parent2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5 (diff)
downloadframeworks_base-0076f4ac0f35814fed1613cae1120b3d954fe985.zip
frameworks_base-0076f4ac0f35814fed1613cae1120b3d954fe985.tar.gz
frameworks_base-0076f4ac0f35814fed1613cae1120b3d954fe985.tar.bz2
am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions