tree b4d76160c215674a6c65ea6a47b88983402f1e6a
parent 098f5bd427574b2d80912d683a2d4c0ca23e998f
parent 0fb66c2b83084a16989afaf949d0101cb6505398
author Eric Laurent <elaurent@google.com> 1306535185 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1306535185 -0700

Merge "New effect library API"