system_core.git - system/core

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of d0b6de41 to master	Ed Tam	2015-04-13	6	-5/+171
\|\
\| *	resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp	Ed Tam	2015-04-13	6	-5/+171
\| \|\
\| \| *	fs_mgr: introduce fs_mgr_format to format wiped partitions	Chris Fries	2015-04-10	6	-3/+171
* \| \|	am d087e6f3: am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: ...	Mohamad Ayyash	2015-04-09	2	-27/+54
\|\ \ \ \| \|/ /
\| * \|	Revert "Revert "fs_mgr_verity: Add support for squashfs""	Mohamad Ayyash	2015-04-08	2	-27/+54
* \| \|	am 0009bacf: am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add supp...	Mohamad Ayyash	2015-04-08	2	-39/+26
\|\ \ \ \| \|/ /
\| * \|	Merge "Revert "fs_mgr_verity: Add support for squashfs""	Mohamad Ayyash	2015-04-08	2	-39/+26
\| \|\ \
\| \| * \|	Revert "fs_mgr_verity: Add support for squashfs"	Mohamad Ayyash	2015-04-08	2	-39/+26
* \| \| \|	am d411d14a: am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for ...	Mohamad Ayyash	2015-04-08	2	-26/+39
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "fs_mgr_verity: Add support for squashfs"	Mohamad Ayyash	2015-04-08	2	-26/+39
\| \|\ \ \ \| \| \|/ /
\| \| * \|	fs_mgr_verity: Add support for squashfs	Mohamad Ayyash	2015-04-06	2	-26/+39
* \| \| \|	am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verif...	Sami Tolvanen	2015-04-07	1	-20/+117
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Restore verity state when verified partition is reflashed"	Sami Tolvanen	2015-04-07	1	-20/+117
\| \|\ \ \
\| \| * \| \|	Restore verity state when verified partition is reflashed	Sami Tolvanen	2015-03-31	1	-20/+117
* \| \| \| \|	am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified...	Sami Tolvanen	2015-04-07	2	-31/+37
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Set verity mode as the verified property value"	Sami Tolvanen	2015-04-07	2	-31/+37
\| \|\ \ \ \ \| \| \|/ / / \| \| \| / / \| \| \|/ / \| \|/\| \|
\| \| * \|	Set verity mode as the verified property value	Sami Tolvanen	2015-03-31	2	-31/+37
* \| \| \|	Merge "Revert "Revert "Adding e4crypt support"""	Paul Lawrence	2015-04-02	4	-27/+102
\|\ \ \ \
\| * \| \| \|	Revert "Revert "Adding e4crypt support""	Paul Lawrence	2015-04-01	4	-27/+102
* \| \| \| \|	am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."	Dan Albert	2015-04-02	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	Link libc++_static into fs_mgr.	Dan Albert	2015-04-01	1	-0/+1
\| * \| \|	Revert "Revert "Adding e4crypt support""	Paul Lawrence	2015-03-31	4	-27/+102
\| \|/ /
* \| \|	am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build"	Sami Tolvanen	2015-03-26	1	-15/+14
\|\ \ \ \| \|/ /
\| * \|	Fix build	Sami Tolvanen	2015-03-26	1	-15/+14
* \| \|	am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verit...	Sami Tolvanen	2015-03-26	3	-63/+197
\|\ \ \ \| \|/ /
\| * \|	Use structured format for verity metadata	Sami Tolvanen	2015-03-24	3	-63/+197
* \| \|	Revert "Adding e4crypt support"	Paul Lawrence	2015-03-26	4	-104/+30
* \| \|	Adding e4crypt support	Paul Lawrence	2015-03-23	4	-30/+104
* \| \|	am 54bac178: am ddd0639e: Merge "Add init command to set verified properties"	Sami Tolvanen	2015-03-20	2	-7/+20
\|\ \ \ \| \|/ /
\| * \|	Add init command to set verified properties	Sami Tolvanen	2015-03-19	2	-7/+20
* \| \|	am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init t...	Sami Tolvanen	2015-03-11	1	-27/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Do not call libcutils property_set in init through libfs_mgr"	Sami Tolvanen	2015-03-11	1	-27/+1
\| \|\ \
\| \| * \|	Do not call libcutils property_set in init through libfs_mgr	Sami Tolvanen	2015-03-05	1	-27/+1
* \| \| \|	fs_mgr: recognize a notrim mountpoint flag	JP Abgrall	2015-03-05	3	-0/+8
\|/ / /
* \| \|	am 291ce5b8: Merge "Fs_mgr: Fix format code"	Andreas Gampe	2015-03-04	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Fs_mgr: Fix format code	Andreas Gampe	2015-03-04	1	-1/+1
* \| \|	am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"	Sami Tolvanen	2015-03-04	2	-10/+343
\|\ \ \ \| \|/ /
\| * \|	Merge "Add fs_mgr support for dm-verity modes"	Sami Tolvanen	2015-03-04	2	-10/+343
\| \|\ \
\| \| * \|	Add fs_mgr support for dm-verity modes	Sami Tolvanen	2015-03-04	2	-10/+343
* \| \| \|	am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"	Sami Tolvanen	2015-02-28	3	-6/+14
\|\ \ \ \ \| \|/ / /
\| * \| \|	Set underlying block device RO when enabling verity	Sami Tolvanen	2015-02-27	3	-6/+14
\| \|/ /
* \| \|	Merge commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31' into HEAD	Bill Yi	2015-02-19	4	-11/+8
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	am 317b4024: Revert "Make encryption configurable"	Paul Lawrence	2015-02-07	3	-7/+3
\| \|\ \ \| \| \|/
\| \| *	Revert "Make encryption configurable"	Paul Lawrence	2015-02-06	3	-7/+3
\| * \|	am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"	Nick Kralevich	2015-02-06	2	-3/+14
\| \|\ \
\| * \ \	am bda62724: Make encryption configurable	Paul Lawrence	2015-01-26	3	-3/+7
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Make encryption configurable	Paul Lawrence	2015-01-21	3	-3/+7
\| * \| \|	am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"	Elliott Hughes	2015-01-23	1	-0/+91
\| \|\ \ \
\| * \ \ \	am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""	Elliott Hughes	2015-01-23	1	-91/+0
\| \|\ \ \ \
\| * \ \ \ \	am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"	JP Abgrall	2015-01-23	1	-0/+91
\| \|\ \ \ \ \