OSDN Git Service

Merge changes I3508c15a,I7b735ec0
authorJulia Reynolds <juliacr@google.com>
Tue, 27 Oct 2015 19:07:09 +0000 (19:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Oct 2015 19:07:09 +0000 (19:07 +0000)
commite8244399bc092128d71064cfcdbbf158851c9c54
tree99cf4bc7f81d837cf6a92714afa7fc0ba6719f71
parentb12e9adc97adf6db90a896f2af37d7f1d0c1fe1b
parent35f8f6bcf30aa26e07a103b3e591314f45908fb8
Merge changes I3508c15a,I7b735ec0

* changes:
  Always show rule creation option.
  Remove some dead zen mode code.