frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."	Alex Klyubin	2015-04-09	2	-0/+11
\|\
\| *	Merge "Add missing mapping between JCA and keystore HMAC names."	Alex Klyubin	2015-04-09	2	-0/+11
\| \|\
\| \| *	Add missing mapping between JCA and keystore HMAC names.	Alex Klyubin	2015-04-09	2	-0/+11
* \| \|	am d9f32b16: Merge "Ensure alignment of Res_png_9patch."	Dan Albert	2015-04-09	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Ensure alignment of Res_png_9patch."	Dan Albert	2015-04-09	1	-1/+1
\| \|\ \
\| \| * \|	Ensure alignment of Res_png_9patch.	Dan Albert	2015-04-09	1	-1/+1
* \| \| \|	am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studi...	Rich Slogar	2015-04-09	1	-8/+42
\|\ \ \ \
\| * \ \ \	am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard se...	Rich Slogar	2015-04-09	1	-8/+42
\| \|\ \ \ \
\| \| * \ \ \	am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from p...	Rich Slogar	2015-04-09	1	-8/+42
\| \| \|\ \ \ \
\| \| \| * \ \ \	am 36e3f512: Merge "docs: remove studio proguard settings from play services"...	Rich Slogar	2015-04-09	1	-8/+42
\| \| \| \|\ \ \ \
\| \| \| \| * \ \ \	Merge "docs: remove studio proguard settings from play services" into lmp-docs	Rich Slogar	2015-04-09	1	-8/+42
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \| \| \|	docs: remove studio proguard settings from play services	Rich Slogar	2015-03-11	1	-8/+42
* \| \| \| \| \| \| \| \|	am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionReq...	Alex Klyubin	2015-04-09	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."	Alex Klyubin	2015-04-09	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.	Alex Klyubin	2015-04-09	1	-1/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	am a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys."	Alex Klyubin	2015-04-09	6	-12/+247
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge "Require IND-CPA by default for new AndroidKeyStore keys."	Alex Klyubin	2015-04-09	6	-12/+247
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Require IND-CPA by default for new AndroidKeyStore keys.	Alex Klyubin	2015-04-08	6	-12/+247
* \| \| \| \| \| \| \| \|	am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat."	Richard Uhler	2015-04-09	5	-124/+64
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge "Reuse dexopt method for both dex2oat and patchoat."	Richard Uhler	2015-04-09	5	-124/+64
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Reuse dexopt method for both dex2oat and patchoat.	Richard Uhler	2015-04-03	5	-124/+64
* \| \| \| \| \| \| \| \| \|	am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge"	Colin Cross	2015-04-09	4	-5/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge "Re-enable -Wall and -Werror that were lost in a merge"	Colin Cross	2015-04-09	4	-5/+2
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Re-enable -Wall and -Werror that were lost in a merge	Colin Cross	2015-04-08	4	-5/+2
* \| \| \| \| \| \| \| \| \| \|	am e8a3c320: Merge "Prevent windows from freezing screen while timeout"	Olawale Ogunwale	2015-04-09	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge "Prevent windows from freezing screen while timeout"	Olawale Ogunwale	2015-04-08	1	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Prevent windows from freezing screen while timeout	tiger_huang	2015-04-08	1	-2/+3
* \| \| \| \| \| \| \| \| \| \| \|	am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API."	Alex Klyubin	2015-04-09	4	-23/+190
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge "Add more digests to AndroidKeyStore API."	Alex Klyubin	2015-04-08	4	-23/+190
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add more digests to AndroidKeyStore API.	Alex Klyubin	2015-04-08	4	-23/+190
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	am c0d6b7cb: Merge "Fix typo"	Alex Klyubin	2015-04-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge "Fix typo"	Alex Klyubin	2015-04-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Fix typo	Alex Klyubin	2015-04-08	1	-1/+1
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	am edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore."	Alex Klyubin	2015-04-08	1	-14/+44
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore."	Alex Klyubin	2015-04-08	1	-14/+44
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Refuse to reuse IV in encryption mode in AndroidKeyStore.	Alex Klyubin	2015-04-08	1	-14/+44
* \| \| \| \| \| \| \| \| \| \| \|	am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."	Alex Klyubin	2015-04-08	1	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge "Add BlockMode.GCM constant to AndroidKeyStore API."	Alex Klyubin	2015-04-08	1	-1/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add BlockMode.GCM constant to AndroidKeyStore API.	Alex Klyubin	2015-04-07	1	-1/+12
\| \| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	am 67f0c8db: am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lm...	Quddus Chong	2015-04-08	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fi...	Quddus Chong	2015-04-08	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken li...	Quddus Chong	2015-04-08	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutom...	Quddus Chong	2015-04-08	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \| \|/\| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunA...	Quddus Chong	2015-04-08	1	-1/+1
\| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| \| * \| \| \| \| \| \|	cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey...	Quddus Chong	2015-04-08	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomati...	Quddus Chong	2015-04-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMo...	Quddus Chong	2015-04-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method...	Quddus Chong	2015-04-08	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \|	Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description....	Quddus Chong	2015-04-08	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \|	Fixed broken link in UiAutomation.setRunAsMonkey() method description.	Quddus Chong	2015-04-07	1	-1/+1