commit | 196a05724d73832571c6e4ad5372b05840ec041f | [log] [tgz] |
---|---|---|
author | Bryce Lee <brycelee@google.com> | Fri Apr 08 20:59:09 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 08 20:59:10 2016 +0000 |
tree | 85a3442aae426876943e19367d72ecef889423f7 | |
parent | 44303087cc4d8a0830b14a87c2b7f32a39e9080b [diff] | |
parent | 7219adadb05d916874e7edff553dfc34bccf94ef [diff] |
Merge "Add granular control over disabled effects." into nyc-dev