OSDN Git Service

am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing...
authorJohn Spurlock <jspurlock@google.com>
Thu, 4 Jun 2015 14:58:01 +0000 (14:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Jun 2015 14:58:01 +0000 (14:58 +0000)
* commit '34a78be5844f3e12fb6abccef12646d3c800fe7a':
  Settings: Enable "ok" dialog button for no-op changes to existing zen rules.


Trivial merge