summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-12-26 15:34:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-26 15:34:14 -0800
commitad141bd7e267c74daf33416412f9aab30e9751fa (patch)
tree00305c6c9559fb47f34dc37dfa3043c6095ed06c
parentb6d55917122b314c4ec547263e774934d67f2973 (diff)
parentdd6517c9dff66a2165e147201e813e1f305425c2 (diff)
downloadframeworks_base-ad141bd7e267c74daf33416412f9aab30e9751fa.zip
frameworks_base-ad141bd7e267c74daf33416412f9aab30e9751fa.tar.gz
frameworks_base-ad141bd7e267c74daf33416412f9aab30e9751fa.tar.bz2
am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'dd6517c9dff66a2165e147201e813e1f305425c2': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions