| commit | c070a099f5e96d7d6eb4553b9d4591708bab20af | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Mon Mar 14 15:54:18 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 14 15:54:19 2016 +0000 |
| tree | 9f17e17222cc4e41c9430b81323e93dcca2dd32a | |
| parent | b4cab0bd5d5929731e0f408cbacba36a4fc7f4af [diff] | |
| parent | d4c9e541ec7110d3c842d6f92c3ec6beb0b6d997 [diff] |
Merge "Add ENCRYPTION_STATUS_ACTIVE_PER_USER to..." into nyc-dev