tree 9078671f26ee1ebf495d97c3afbf62a993fbd454
parent aaf130873d5e45f942e87dc090a517f79afe6d14
parent a746ed8549873c98fca7ab9423c23d6b327b7234
author Chris Craik <ccraik@google.com> 1411149835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411149835 +0000

am 53dc022a: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev

* commit '53dc022a6c12c1b916583dc8aee92cb63c7f73f5':
  Hide other color filter mutability