android_system_security - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2	Dan Pasanen	2017-04-05	9	-31/+197
\|\
\| *	Support and use TAG_ALLOW_WHILE_ON_BODY	Tucker Sylvestro	2016-10-05	9	-31/+197
* \|	Merge tag 'android-7.1.1_r21' into cm-14.1cm-14.1_old	Dan Pasanen	2017-02-23	0	-0/+0
\|\\|
\| *	Move keystore to foreground cpuset.	Martijn Coenen	2016-04-25	1	-0/+1
\| \|\
* \| \	Merge 29471e09a0026b4ea5763470dfc0ad59eaf55fb5 on remote branchstaging/cm-14.1-cafrebase	Linux Build Service Account	2016-11-07	1	-0/+26
\|\ \ \
\| * \| \|	Promotion of android-framework.lnx.2.0.c1-00004.	Linux Build Service Account	2016-11-03	1	-0/+26
\|/\| \| \|
\| * \| \|	keystore: Enable Soter for Android N	Shivaprasad Hongal	2016-10-18	1	-0/+26
\|/ / /
* \| \|	merge in nyc-release history after reset to nyc-devcm-14.0	The Android Automerger	2016-04-26	0	-0/+0
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	merge in nyc-release history after reset to nyc-dev	The Android Automerger	2016-03-31	0	-0/+0
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	merge in nyc-release history after reset to nyc-dev	The Android Automerger	2016-03-27	0	-0/+0
\| \| \|\
\| \| \| *	merge in nyc-release history after reset to nyc-dev	The Android Automerger	2016-02-11	0	-0/+0
\| \| \| \|\
\| \| \| \| *	merge in nyc-release history after reset to master	The Android Automerger	2016-02-07	0	-0/+0
\| \| \| \| \|\
\| \| \| \| \| *	merge in nyc-release history after reset to master	The Android Automerger	2016-02-02	0	-0/+0
\| \| \| \| \| \|\
\| \| \| \| \| \| *	merge in nyc-release history after reset to master	The Android Automerger	2016-02-02	0	-0/+0
\| \| \| \| \| \| \|\ \| \| \| \| \| \| \|/ \| \| \| \| \| \|/\|
* \| \| \| \| / \|	Move keystore to foreground cpuset.	Martijn Coenen	2016-04-15	1	-0/+1
\|/ / / / / /
* \| \| \| \| \|	Implement key upgrade in keystore.	Shawn Willden	2016-03-29	2	-4/+90
* \| \| \| \| \|	Configure keymaster with OS version info.	Shawn Willden	2016-03-29	1	-0/+22
\|/ / / / /
* / / / /	Fix AuthTokenTable tests.	Shawn Willden	2016-03-25	4	-80/+131
\|/ / / /
* / / /	Actually pass attestation requests through to keystore.	Shawn Willden	2016-02-08	1	-1/+16
\|/ / /
* / /	Fix various memory errors.	Shawn Willden	2016-02-02	2	-10/+26
\|/ /
* \|	Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8	Shawn Willden	2016-01-28	6	-110/+151
\|\ \ \| \|/ \|/\|
\| *	Merge changes from topic \'km_tag_allow_on_body\'	Shawn Willden	2016-01-28	6	-110/+151
\| \|\
\| \| *	Merge changes from topic 'km_tag_allow_on_body'	Shawn Willden	2016-01-28	6	-110/+151
\| \| \|\
\| \| \| *	Add KM_TAG_ALLOW_WHILE_ON_BODY	Shawn Willden	2016-01-27	2	-93/+6
\| \| \| *	Add attestation support to keystore.	Shawn Willden	2016-01-27	4	-17/+145
\| \| \|/
* \| \|	Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5	Shawn Willden	2016-01-27	7	-126/+122
\|\\| \|
\| * \|	Merge "Update Keystore to use keymaster2 HAL."	Shawn Willden	2016-01-27	7	-126/+122
\| \|\\|
\| \| *	Merge "Update Keystore to use keymaster2 HAL."	Shawn Willden	2016-01-27	7	-126/+122
\| \| \|\
\| \| \| *	Update Keystore to use keymaster2 HAL.	Shawn Willden	2016-01-26	7	-126/+122
* \| \| \|	Refactor keystore.	Shawn Willden	2016-01-26	17	-3146/+3735
* \| \| \|	Merge "Refactor keystore." am: e4f2fa54b0	Shawn Willden	2016-01-26	0	-0/+0
\|\\| \| \|
\| * \| \|	Merge "Refactor keystore."	Shawn Willden	2016-01-26	17	-3127/+3720
\| \|\\| \|
\| \| * \|	Merge "Refactor keystore."	Shawn Willden	2016-01-26	17	-3127/+3720
\| \| \|\\|
\| \| \| *	Refactor keystore.	Shawn Willden	2016-01-26	17	-3127/+3720
\| \| \|/
* \| \|	keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s ours	Baligh Uddin	2016-01-26	0	-0/+0
\|\\| \|
\| * \|	keep history after reset to mnc-dr-dev	Baligh Uddin	2016-01-26	0	-0/+0
\| \|\ \
\| \| * \	keep history after reset to mnc-dr-dev	Baligh Uddin	2016-01-25	0	-0/+0
\| \| \|\ \
* \| \| \| \|	Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2	Shawn Willden	2016-01-25	1	-0/+12
\|\\| \| \| \|
\| * \| \| \|	Merge "Update keystore_cli_v2 for keymaster_defs changes."	Shawn Willden	2016-01-25	1	-0/+12
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge "Update keystore_cli_v2 for keymaster_defs changes."	Shawn Willden	2016-01-25	1	-0/+12
\| \| \|\ \ \
\| \| \| * \| \|	Update keystore_cli_v2 for keymaster_defs changes.	Shawn Willden	2016-01-20	1	-0/+12
\| \| \|/ / /
* \| \| \| \|	Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b...	Shawn Willden	2015-12-23	0	-0/+0
\|\ \ \ \ \
\| * \ \ \ \	Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5	Shawn Willden	2015-11-23	0	-0/+0
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
* \| \| \| \| \|	Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6	Shawn Willden	2015-12-23	0	-0/+0
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge "ECIES: adding ECIES-KEM" am: ab42146068	Shawn Willden	2015-11-23	1	-0/+6
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b...	Shawn Willden	2015-11-26	0	-0/+0
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5	Shawn Willden	2015-11-23	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Limit maximum number of concurrent keystore operations."	Shawn Willden	2015-11-23	2	-12/+35
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Merge "Limit maximum number of concurrent keystore operations."	Shawn Willden	2015-11-23	2	-12/+35
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Limit maximum number of concurrent keystore operations.	Shawn Willden	2015-11-23	2	-12/+35