tree 668beb7d3956e76167c25158b8bf88b3667c9561
parent b7b605ff5b4682bc650461c2b987aa031a1071ca
parent 7f9d25cc887d9a4d32b6680395628c18bf949ae7
author Eddy Talvala <etalvala@google.com> 1323207264 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323207264 -0800

Merge "CTS-like Test for Face Effects recording support" into ics-mr1