frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "TaskManager API first pass."	Matthew Williams	2014-05-01	7	-0/+919
\|\
\| *	TaskManager API first pass.	Matthew Williams	2014-04-21	7	-0/+919
* \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2014-05-01	56	-479/+1481
\|\ \
\| * \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-04-30	56	-479/+1481
* \| \|	Merge "Revert "Temporarily switch off returning only enabled profiles to supp...	Alexandra Gherghina	2014-05-01	1	-2/+1
\|\ \ \
\| * \| \|	Revert "Temporarily switch off returning only enabled profiles to support dog...	Alexandra Gherghina	2014-04-30	1	-2/+1
* \| \| \|	Merge "Fixed transition start delay propagation when duration = 0."	George Mount	2014-05-01	2	-6/+14
\|\ \ \ \
\| * \| \| \|	Fixed transition start delay propagation when duration = 0.	George Mount	2014-05-01	2	-6/+14
* \| \| \| \|	Fix build.	Narayan Kamath	2014-05-01	1	-22/+0
* \| \| \| \|	Merge "Fix "blink" when going "back" quickly after entering Activity."	George Mount	2014-05-01	1	-2/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix "blink" when going "back" quickly after entering Activity.	George Mount	2014-04-30	1	-2/+1
\| \|/ / / /
* \| \| \| \|	am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."	Narayan Kamath	2014-05-01	1	-0/+22
\|\ \ \ \ \
\| * \ \ \ \	am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."	Narayan Kamath	2014-05-01	1	-0/+22
\| \|\ \ \ \ \
\| \| * \ \ \ \	am b916d8ad: Merge "Implement FileUtils#contains."	Narayan Kamath	2014-05-01	1	-0/+22
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Implement FileUtils#contains.	Narayan Kamath	2014-05-01	1	-0/+22
* \| \| \| \| \| \| \|	Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"	Alexandra Gherghina	2014-05-01	5	-25/+29
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Adds an enabled state in UserInfo instead of DevicePolicyManager	Alexandra Gherghina	2014-05-01	5	-25/+29
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge "Add unit tests for InputMethodSubtypeSwitchingController"	Yohei Yukawa	2014-05-01	4	-40/+257
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add unit tests for InputMethodSubtypeSwitchingController	Yohei Yukawa	2014-05-01	4	-40/+257
* \| \| \| \| \| \| \| \|	am 6c2e8062: am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."	Narayan Kamath	2014-05-01	1	-7/+5
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."	Narayan Kamath	2014-05-01	1	-7/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."	Narayan Kamath	2014-05-01	1	-7/+5
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix broken logging in Zygote.cpp.	Narayan Kamath	2014-05-01	1	-7/+5
* \| \| \| \| \| \| \| \|	Merge "Introduce forwarding intents across profiles."	Nicolas Prevot	2014-05-01	8	-0/+189
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Introduce forwarding intents across profiles.	Nicolas Prevot	2014-04-30	8	-0/+189
* \| \| \| \| \| \| \| \|	Merge "Add missing ifdefs"	John Reck	2014-05-01	2	-0/+10
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add missing ifdefs	John Reck	2014-04-30	2	-0/+10
* \| \| \| \| \| \| \| \| \|	am 006c2110: am 11b715da: Merge "Make touch slop region smaller for watch" in...	Mindy Pereira	2014-04-30	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modula...	Mindy Pereira	2014-04-30	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Make touch slop region smaller for watch	Mindy Pereira	2014-04-30	1	-1/+4
* \| \| \| \| \| \| \| \| \| \|	am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL poin...	Michael Wright	2014-04-30	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for...	Michael Wright	2014-04-30	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSe...	Michael Wright	2014-04-30	1	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperInt...	Michael Wright	2014-04-30	1	-0/+4
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent	Allen Shen	2014-04-30	1	-0/+4
* \| \| \| \| \| \| \| \| \| \| \|	am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJp...	Elliott Hughes	2014-04-30	1	-5/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"	Elliott Hughes	2014-04-30	1	-5/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"	Elliott Hughes	2014-04-30	1	-5/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \|	Merge "Fix for native leaks in YuvToJpegEncoder.cpp"	Elliott Hughes	2014-04-30	1	-5/+6
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \|	Fix for native leaks in YuvToJpegEncoder.cpp	Pawel Augustyn	2014-02-04	1	-5/+6
\| \| \| * \| \| \| \| \| \| \| \| \|	DO NOT MERGE Add invokeFunctor stub	Bo Liu	2014-04-29	1	-0/+5
\| \| \| \| \|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	am 9a76e9ba: Fix build error	Bill Yi	2014-04-30	1	-2/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	Fix build error	Bill Yi	2014-04-29	1	-2/+5
\| \| * \| \| \| \| \| \| \| \| \|	Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD	Bill Yi	2014-04-29	163	-904/+1408
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for ...	Eino-Ville Talvala	2014-03-25	1	-4/+26
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"	Kenny Root	2014-03-25	4	-34/+387
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \	am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."	Narayan Kamath	2014-03-25	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \	am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly s...	Gabriel Peal	2014-03-22	1	-0/+31
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \	am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceF...	Chad Brubaker	2014-03-21	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev	Unsuk Jung	2014-03-21	1	-64/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \