diff options
author | Eric Fischer <enf@google.com> | 2011-04-04 16:46:38 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 16:46:38 -0700 |
commit | 9f4ef02aef8f3cc1969f83f59a9be40f1ff71625 (patch) | |
tree | a4cb1ee95ce38c86d6fad2178ba0b97b88d654c0 /libs/rs/rsScriptC.cpp | |
parent | c5a229665dbea7572f991180388c8bbe992a3438 (diff) | |
parent | 2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7 (diff) |
am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/rs/rsScriptC.cpp')
0 files changed, 0 insertions, 0 deletions