am 2e104047: am b93b9361: (-s ours) am d055b32f: Remove white gradient test without...
authorMika Isojärvi <misojarvi@google.com>
Thu, 27 Aug 2015 14:47:09 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:09 +0000 (14:47 +0000)
* commit '2e1040472399976e6ac39f25bc51d05642f7fc49':


Trivial merge