OSDN Git Service

am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev
authorPaul Lawrence <paullawrence@google.com>
Fri, 15 May 2015 22:33:31 +0000 (22:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 22:33:31 +0000 (22:33 +0000)
commitedc3fbb90619eb89da7db5cf1c76026a19a2ac98
treebca1be810cfa7ef0d45c9ab221f966257a7d31c5
parent47247e728abb6bee77e2f650b9a339cdd55ddc29
parent21c8a4930630d9f0a4b0dc3d56534b0b30bb0851
am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev

* commit '21c8a4930630d9f0a4b0dc3d56534b0b30bb0851':
  DOn't save encryption settings when not encrypted