| commit | 666f308ce71639b950ed0ef84ef7827f49776d0e | [log] [tgz] |
|---|---|---|
| author | Jason Sams <rjsams@android.com> | Fri Feb 12 11:33:54 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 12 11:33:54 2010 -0800 |
| tree | 5fdc45120a49535a31d5b5b33cde3fe2de9176b2 | |
| parent | 95db7376b1a77a2588463d3196a38861db939766 [diff] | |
| parent | f80592cc642828c5c1e4638f5d495d186c4b3e6c [diff] |
am f80592cc: (-s ours) am 52ba5b08: DO NOT MERGE. Update for new RS library with ES 2.0 support. Merge commit 'f80592cc642828c5c1e4638f5d495d186c4b3e6c' * commit 'f80592cc642828c5c1e4638f5d495d186c4b3e6c': DO NOT MERGE. Update for new RS library with ES 2.0 support.