OSDN Git Service

Merge "DOn't save encryption settings when not encrypted" into mnc-dev
authorPaul Lawrence <paullawrence@google.com>
Fri, 15 May 2015 22:22:18 +0000 (22:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 May 2015 22:22:25 +0000 (22:22 +0000)
commit21c8a4930630d9f0a4b0dc3d56534b0b30bb0851
treeb5460ed3a70ce92212f243647797091d662c39d4
parentce27996c4fe665e88222bb913060d8de991ede4f
parent688af6c5743d4ef5d08537b02b23fdde24a3c348
Merge "DOn't save encryption settings when not encrypted" into mnc-dev