frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Fix an NPE in NsdManager"	Wink Saville	2013-07-01	1	-0/+8
\|\
\| *	Fix an NPE in NsdManager	Vinit Deshapnde	2013-06-25	1	-0/+8
* \|	am 60c2772c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -...	The Android Open Source Project	2013-07-01	0	-0/+0
\|\ \
\| \| \
\| \| \
\| *-. \	Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge	The Android Open Source Project	2013-07-01	0	-0/+0
\| \|\ \ \
\| \| \| * \	merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev	The Android Automerger	2013-07-01	0	-0/+0
\| \| \| \|\ \
\| \| \| \| * \	merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev	The Android Automerger	2013-06-30	0	-0/+0
\| \| \| \| \|\ \
\| \| * \| \| \| \|	Fix out of range glCopyTexImage2D	Romain Guy	2013-06-28	1	-6/+9
\| \| * \| \| \| \|	When a new user AID is generated, dump it to dropbox	Amith Yamasani	2013-06-28	1	-0/+14
\| \| * \| \| \| \|	Recreate TextureView's display list on attach	Romain Guy	2013-06-28	1	-0/+8
\| \| * \| \| \| \|	Fix power issues around wifi scans.	Robert Greenwalt	2013-06-28	4	-60/+65
* \| \| \| \| \| \|	Merge "464xlat: use a gatewayed route, not point-to-point"	Lorenzo Colitti	2013-07-01	1	-6/+13
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	464xlat: use a gatewayed route, not point-to-point	Lorenzo Colitti	2013-06-29	1	-6/+13
* \| \| \| \| \| \| \|	am 653efe73: am 6635e269: am e9df511e: DOC: Sync Adapters Android Training	Joe Malin	2013-06-30	7	-0/+1841
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	am 6635e269: am e9df511e: DOC: Sync Adapters Android Training	Joe Malin	2013-06-30	7	-0/+1841
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	am e9df511e: DOC: Sync Adapters Android Training	Joe Malin	2013-06-30	7	-0/+1841
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	DOC: Sync Adapters Android Training	Joe Malin	2013-06-29	7	-0/+1841
\| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
* \| \| \| \| \| \| \|	Merge "Make sure textviews draw in layers"	Romain Guy	2013-06-29	2	-6/+24
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Make sure textviews draw in layers	Romain Guy	2013-06-28	2	-6/+24
* \| \| \| \| \| \| \| \|	Merge "More work on procstats: save/restore state, fixes."	Dianne Hackborn	2013-06-29	6	-356/+903
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	More work on procstats: save/restore state, fixes.	Dianne Hackborn	2013-06-28	6	-356/+903
* \| \| \| \| \| \| \| \| \|	am 1a6fe26d: am c63c0682: am e3b94f05: Merge "Track libcore API change."	Elliott Hughes	2013-06-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	am c63c0682: am e3b94f05: Merge "Track libcore API change."	Elliott Hughes	2013-06-28	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	am e3b94f05: Merge "Track libcore API change."	Elliott Hughes	2013-06-28	1	-0/+1
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \	Merge "Track libcore API change."	Elliott Hughes	2013-06-29	1	-0/+1
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \|	Track libcore API change.	Elliott Hughes	2013-06-28	1	-0/+1
\| \| \| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Correct request template value for record and still	Zhijun He	2013-06-28	2	-11/+11
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Revert "Plumb View.getAccessibilityNodeProvider though WebViewProvider.""	Ben Murdoch	2013-06-29	3	-17/+0
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "Plumb View.getAccessibilityNodeProvider though WebViewProvider."	Ben Murdoch	2013-06-29	3	-17/+0
* \| \| \| \| \| \| \| \| \| \| \| \|	am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp	Elliott Hughes	2013-06-28	10	-39/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp	Elliott Hughes	2013-06-28	10	-39/+39
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of fca0f92e to stage-aosp-master	Elliott Hughes	2013-06-28	10	-39/+39
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge "Switch frameworks/base over from @hidden Charsets to public StandardCh...	Elliott Hughes	2013-06-28	10	-39/+39
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Switch frameworks/base over from @hidden Charsets to public StandardCharsets.	Elliott Hughes	2013-06-28	10	-39/+39
\| \| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	am d1411efe: am 324993ab: am 5216f11e: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	am 324993ab: am 5216f11e: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+9
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	am 5216f11e: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+9
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+9
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Track libcore API update.	Elliott Hughes	2013-06-28	1	-0/+9
\| \| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	am 5d2d2222: am ce566b50: am ee66531f: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	am ce566b50: am ee66531f: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	am ee66531f: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Track libcore API update.	Elliott Hughes	2013-06-28	1	-0/+2
\| \| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Bugfix 9603757 master/flo tremendous Gallery battery drain on idle dev...	Georgi Nikolov	2013-06-28	1	-4/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Bugfix 9603757	Georgi Nikolov	2013-06-28	1	-4/+12
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Plumb View.getAccessibilityNodeProvider though WebViewProvider."	Ben Murdoch	2013-06-28	3	-0/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Plumb View.getAccessibilityNodeProvider though WebViewProvider.	Ben Murdoch	2013-06-24	3	-0/+17
* \| \| \| \| \| \| \| \| \| \| \| \|	am 34ba52a0: am a9510297: am 505974eb: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	am a9510297: am 505974eb: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	am 505974eb: Merge "Track libcore API update."	Elliott Hughes	2013-06-28	1	-0/+12
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \|