tree 68c9ad103e418b9ec72d69e02738fd52b990af2d
parent 3750e75f755fbe988af2d9e9c9de5a37fcf51453
parent 60a729c8e93461c9446d0c8cd519b40dec01e8d8
author Winson Chung <winsonc@google.com> 1407971263 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407885288 +0000

Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev