summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-20 18:43:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 18:43:00 +0000
commitfbb100c437d52db818e6e57c18ffe1e969ba46b0 (patch)
tree9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0
parenta69996e45c7c40d971b05a56866b7ac5c7f617de (diff)
parentea17c6365fd70b057a4c696d9eec2b5f70b6e476 (diff)
downloadframeworks_base-fbb100c437d52db818e6e57c18ffe1e969ba46b0.zip
frameworks_base-fbb100c437d52db818e6e57c18ffe1e969ba46b0.tar.gz
frameworks_base-fbb100c437d52db818e6e57c18ffe1e969ba46b0.tar.bz2
am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ea17c6365fd70b057a4c696d9eec2b5f70b6e476': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions