OSDN Git Service

Merge "Fixed an issue where the scrim could be lost" into nyc-dev
authorSelim Cinek <cinek@google.com>
Wed, 4 May 2016 23:39:01 +0000 (23:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 23:39:01 +0000 (23:39 +0000)
commitbcfd427b1151d181c966e2995e1631a3df7e6dd6
treeea635eeef5693b508a3c21271b822357178bc257
parent8c6d8a8d9917b558536862c32162013fe69c8be5
parent05d61edeb271167b6a9a97aa9adf1fe7bfb9bfbf
Merge "Fixed an issue where the scrim could be lost" into nyc-dev
am: 05d61edeb2

* commit '05d61edeb271167b6a9a97aa9adf1fe7bfb9bfbf':
  Fixed an issue where the scrim could be lost

Change-Id: I72f8ed8b302d9e9542e2ae3c540f671d344b74bf