summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-12-01 18:50:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-01 18:50:30 -0800
commit871465fdd57472c8114cd7b2a7c59c966b617dbe (patch)
treee51e4d99329a2999501e61a3ddbce46e57a86eef /libs
parented2168524b37c4124fd084b0e92f51b681773a75 (diff)
parent7a6a867f9eaacd9206ab0476f0444b417f556674 (diff)
downloadframeworks_base-871465fdd57472c8114cd7b2a7c59c966b617dbe.zip
frameworks_base-871465fdd57472c8114cd7b2a7c59c966b617dbe.tar.gz
frameworks_base-871465fdd57472c8114cd7b2a7c59c966b617dbe.tar.bz2
am 7a6a867f: (-s ours) am c711e06c: am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit '7a6a867f9eaacd9206ab0476f0444b417f556674' * commit '7a6a867f9eaacd9206ab0476f0444b417f556674': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions