diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-27 18:28:18 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-28 13:46:00 -0700 |
| commit | 27c39f1adeaf1a653fb41a5af64ee815b8048dd6 (patch) | |
| tree | d72907f43cbae396ee91c3b1b31e8db1184dfd50 /keystore/java/android/security/KeyChain.java | |
| parent | 6b3e0587a052121fd572fd609abcbc75a89d53d6 (diff) | |
am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
Frameworks/base: Add debug.gencfi property
(cherry picked from commit a5b55a017a984608eacdf414bc1cbcd7615f1c13)
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions