commit | 53ac542dae6bb86819ca6beb6a2b3d681abbeb3d | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Mon May 26 20:48:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 26 20:48:51 2014 +0000 |
tree | 157022c5dba07e687821ee783133b6472bc4d531 | |
parent | 7826baa2aaba55d747e2b95f8148d5b2cd3da34d [diff] | |
parent | 7c1d454da1f052c634c6a95ed3805be34d322765 [diff] |
am 7294a594: Merge "Improve scrim handling" into lmp-preview-dev * commit '7294a594ec993352dc6e743ae313308636afb16d': Improve scrim handling