OSDN Git Service

Merge "Don\'t do anti-falsing on locked shade" into nyc-dev
authorAdrian Roos <roosa@google.com>
Wed, 20 Apr 2016 03:06:14 +0000 (03:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 03:06:14 +0000 (03:06 +0000)
commita0ac7a13be607091eabcddf26d28c1f422d44153
tree820008302069597b20009ce771f38097343d7278
parent644a00734f679cb570164e0974c0a98f2a642a59
parentc75e08d114650dc4c81bc8ffb03eab701bc39509
Merge "Don\'t do anti-falsing on locked shade" into nyc-dev
am: c75e08d

* commit 'c75e08d114650dc4c81bc8ffb03eab701bc39509':
  Don't do anti-falsing on locked shade

Change-Id: I9ebf97744dd18fda33fa1dcced6993bb93424c0a