summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-10-22 06:47:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-22 06:47:24 -0700
commit70271e3bbda03225a64ff70c833d97829fc0ac1c (patch)
tree147f2e785d10b8ee407f59b980258fbb429bedba /core/java
parent10a1600673c6a7c3b02c3996ba6b46ef884563ad (diff)
parent2cb6b7fb868899a3c718280605b0e462d0f8491f (diff)
downloadframeworks_base-70271e3bbda03225a64ff70c833d97829fc0ac1c.zip
frameworks_base-70271e3bbda03225a64ff70c833d97829fc0ac1c.tar.gz
frameworks_base-70271e3bbda03225a64ff70c833d97829fc0ac1c.tar.bz2
am 2cb6b7fb: (-s ours) Merge change Ic4bf942c into eclair
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2 * commit '2cb6b7fb868899a3c718280605b0e462d0f8491f': Import revised translations. DO NOT MERGE
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions