summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-12-03 21:17:35 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-03 21:17:35 -0800
commitea71e29a4ba57641a5adc67ff12b46f214a32126 (patch)
tree000f726cd5b635cfba0e1b054e175d0410f919b4 /packages
parent333833541c7c69fcb6849fdd0b7fe9067f60000a (diff)
parenta468a7e533add133ffa4cf5aff89163c126307a7 (diff)
downloadframeworks_base-ea71e29a4ba57641a5adc67ff12b46f214a32126.zip
frameworks_base-ea71e29a4ba57641a5adc67ff12b46f214a32126.tar.gz
frameworks_base-ea71e29a4ba57641a5adc67ff12b46f214a32126.tar.bz2
am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit 'a468a7e533add133ffa4cf5aff89163c126307a7': Import translations. DO NOT MERGE
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions