frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"	Derek Sollenberger	2013-02-06	1	-5/+0
\|\
\| *	am 573a18cc: Merge "Fixing the build"	Svetoslav	2013-01-29	1	-0/+6
\| \|\
\| * \	am 8fea4e72: Merge "Rework ParceledListSlice to be much easier to use."	Dianne Hackborn	2013-01-18	1	-0/+6
\| \|\ \
\| * \ \	am 35654b61: More work on App Ops service.	Dianne Hackborn	2013-01-16	1	-15/+19
\| \|\ \ \
\| * \ \ \	am b7de2194: resolved conflicts for merge of c71c678e to master	Xavier Ducrohet	2013-01-15	1	-1/+7
\| \|\ \ \ \
\| * \ \ \ \	am 72c6137a: Handle empty flag attributes, such as gravity=""	Tor Norbye	2013-01-04	1	-1/+1
\| \|\ \ \ \ \
\| * \ \ \ \ \	am 6fb9a983: Merge "Add single crunch command to aapt."	Xavier Ducrohet	2013-01-02	4	-8/+62
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge "Update framework to support r5967 of Skia." into master-chromium	Derek Sollenberger	2012-12-19	1	-5/+0
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Update framework to support r5967 of Skia.	Derek Sollenberger	2012-12-12	1	-5/+0
* \| \| \| \| \| \| \| \|	App ops: add op for writing settings.	Dianne Hackborn	2013-02-05	1	-0/+12
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fixing the build	Svetoslav	2013-01-29	1	-0/+6
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Rework ParceledListSlice to be much easier to use.	Dianne Hackborn	2013-01-18	1	-0/+6
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	More work on App Ops service.	Dianne Hackborn	2013-01-16	1	-15/+19
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	resolved conflicts for merge of c71c678e to master	Xavier Ducrohet	2013-01-15	1	-1/+7
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1....	Xavier Ducrohet	2013-01-15	1	-0/+19
\| \|\ \ \ \
\| \| * \ \ \	am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev	Xavier Ducrohet	2013-01-15	1	-0/+19
\| \| \|\ \ \ \
\| \| \| * \ \ \	resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev	Xavier Ducrohet	2013-01-15	1	-0/+19
\| \| \| \|\ \ \ \
\| \| \| \| * \ \ \	am de3b69e0: Merge "Fix the single crunch command to return the right error c...	Xavier Ducrohet	2013-01-15	1	-1/+5
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \| \| \|	Fix the single crunch command to return the right error code.	Xavier Ducrohet	2013-01-15	1	-1/+5
\| \| \| \| * \| \| \| \|	am 22d7cf23: Add single crunch command to aapt. do not merge.	Xavier Ducrohet	2013-01-03	4	-8/+62
\| \| \| \| \|\ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| _ / / / \| \| \| \| \| / / /
\| \| \| \| * \| \| \|	Add single crunch command to aapt. do not merge.	Xavier Ducrohet	2013-01-02	4	-8/+62
\| * \| \| \| \| \| \|	am 23307cbb: am e0a676a3: Merge "Fix issue #7649590: Background windows somet...	Dianne Hackborn	2012-12-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	am e0a676a3: Merge "Fix issue #7649590: Background windows sometimes not bein...	Dianne Hackborn	2012-12-03	1	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Fix issue #7649590: Background windows sometimes not being hidden for seconda...	Dianne Hackborn	2012-12-03	1	-1/+1
\| \| \| \|/ / / /
\| \| * \| \| \| \|	am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt	Christopher Tate	2012-11-29	4	-5/+148
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	Cache resource ID lookups in aapt	Christopher Tate	2012-11-28	4	-5/+148
* \| \| \| \| \| \|	Handle empty flag attributes, such as gravity=""	Tor Norbye	2013-01-04	1	-1/+1
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Add single crunch command to aapt.	Xavier Ducrohet	2013-01-02	4	-8/+62
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Remove remaining doc references to StyledAttributes.	John Spurlock	2012-12-18	1	-1/+1
* \| \| \| \|	Fixing the build	Svetoslav Ganov	2012-12-14	1	-3/+13
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Refactoring of the screen magnification feature.	Svetoslav Ganov	2012-12-03	1	-30/+4
* \| \| \|	am e659cea6: am d51ffbea: am faeabc7b: Merge "Cache resource ID lookups in aapt"	Christopher Tate	2012-11-27	4	-5/+148
\|\ \ \ \ \| \|/ / /
\| * \| \|	Cache resource ID lookups in aapt	Christopher Tate	2012-11-27	4	-5/+148
* \| \| \|	am 061b4fae: am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to k...	Jim Miller	2012-11-08	1	-0/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard ...	Jim Miller	2012-11-08	1	-0/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the a...	Jim Miller	2012-11-08	1	-0/+5
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Add mechanism to kick keyguard to show the assistant	Jim Miller	2012-11-08	1	-0/+5
* \| \| \|	am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnab...	Jim Miller	2012-11-08	1	-0/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to ...	Jim Miller	2012-11-08	1	-0/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManager...	Jim Miller	2012-11-07	1	-0/+5
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Add isSafeModeEnabled() API to WindowManagerService	Jim Miller	2012-11-05	1	-0/+5
* \| \| \|	am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"	Kenny Root	2012-11-07	8	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 768d9e1a: Merge "Correct executable bit for source files"	Kenny Root	2012-11-07	8	-0/+0
\| \|\ \ \
\| \| * \| \|	Correct executable bit for source files	Kenny Root	2012-11-07	8	-0/+0
\| \| * \| \|	am fb34490f: Merge "Fix writing text version of styleable IDs."	Xavier Ducrohet	2012-09-26	1	-1/+1
\| \| \|\ \ \
\| \| \| * \| \|	Fix writing text version of styleable IDs.	Xavier Ducrohet	2012-09-26	1	-1/+1
* \| \| \| \| \|	Merge "Enhance AIDL to take an explicit id for methods"	Maurice Chu	2012-10-19	5	-4/+132
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Enhance AIDL to take an explicit id for methods	Maurice Chu	2012-10-18	5	-4/+132
* \| \| \| \| \|	am 26d76606: am d8149b03: Merge "Layoutlib: Read and close XML files as soon ...	Xavier Ducrohet	2012-10-18	1	-3/+68
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible."...	Xavier Ducrohet	2012-10-18	1	-3/+68
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|