tree 85a3442aae426876943e19367d72ecef889423f7
parent 44303087cc4d8a0830b14a87c2b7f32a39e9080b
parent 7219adadb05d916874e7edff553dfc34bccf94ef
author Bryce Lee <brycelee@google.com> 1460149149 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460149150 +0000

Merge "Add granular control over disabled effects." into nyc-dev