summaryrefslogtreecommitdiffstats
path: root/libs/rs/scriptc
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-26 19:11:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 19:11:09 -0800
commitd26b1a3bc05033c0ea6623277023dfbb6c4b8533 (patch)
tree5a7117b4fc8d470319365ecf02b749be1a9a25f4 /libs/rs/scriptc
parent3205206b812817c055aeaf761dfdb8afb639ee66 (diff)
parent280afad7c406a0d2bba966448c8b388d7f726b8a (diff)
downloadframeworks_base-d26b1a3bc05033c0ea6623277023dfbb6c4b8533.zip
frameworks_base-d26b1a3bc05033c0ea6623277023dfbb6c4b8533.tar.gz
frameworks_base-d26b1a3bc05033c0ea6623277023dfbb6c4b8533.tar.bz2
am 280afad7: (-s ours) am 14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '280afad7c406a0d2bba966448c8b388d7f726b8a': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/rs/scriptc')
0 files changed, 0 insertions, 0 deletions