OSDN Git Service

am 8e16c38f: am edc3fbb9: am 21c8a493: Merge "DOn\'t save encryption settings when...
authorPaul Lawrence <paullawrence@google.com>
Fri, 15 May 2015 22:59:38 +0000 (22:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 22:59:38 +0000 (22:59 +0000)
commit5f402f81c8461fe256f82dd88b4dfb580d79f4d0
tree91587a8c491c8a91fa7a75f2f563cb0650e3d243
parent6b410e18ad9332d0e45e51e0d18d2adb89edf75a
parent8e16c38f35628e27c1ddd9cf5d0d097e1f7bcfa0
am 8e16c38f: am edc3fbb9: am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev

* commit '8e16c38f35628e27c1ddd9cf5d0d097e1f7bcfa0':
  DOn't save encryption settings when not encrypted