frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \| \|	am 7f150f86: (-s ours) am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcf...	Geoff Mendal	2013-12-02	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import t...	Geoff Mendal	2013-11-27	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE	Geoff Mendal	2013-11-27	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| _ / / / / / / / / \| \| \| / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	am 99dcfed6: (-s ours) Import translations. DO NOT MERGE	Geoff Mendal	2013-11-27	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / /
\| \| \| * \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2013-11-27	1	-4/+4
* \| \| \| \| \| \| \| \| \| \|	am 1d3205f6: (-s ours) am b6f3708d: am 1044a1dc: Merge "Update delegate metho...	Xavier Ducrohet	2013-12-02	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into ...	Xavier Ducrohet	2013-11-26	5	-89/+25
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev	Xavier Ducrohet	2013-11-26	5	-89/+25
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / /
\| \| \| * \| \| \| \| \| \| \|	Merge "Update delegate methods in layoutlib." into klp-dev	Xavier Ducrohet	2013-11-27	5	-89/+25
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	Update delegate methods in layoutlib.	Deepanshu Gupta	2013-11-25	5	-89/+25
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/...	Jason Sams	2013-12-02	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge "Fix LongArray.addAll() to use correct arraycopy argument order"	Alan Viverette	2013-12-02	1	-1/+7
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix LongArray.addAll() to use correct arraycopy argument order	Alan Viverette	2013-11-27	1	-1/+7
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications."	Lorenzo Colitti	2013-12-02	5	-19/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| / / / / / / / / / \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	am f226bc60: Merge "Use LinkAddress in address notifications."	Lorenzo Colitti	2013-11-26	5	-19/+30
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge "Use LinkAddress in address notifications."	Lorenzo Colitti	2013-11-27	5	-19/+30
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Use LinkAddress in address notifications.	Lorenzo Colitti	2013-11-26	5	-19/+30
* \| \| \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of 37e4c405 to master	Katie McCormick	2013-12-02	4	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| / / / \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs	Katie McCormick	2013-11-26	4	-6/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs	Katie McCormick	2013-11-26	4	-6/+6
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge "Doc updates: Javadoc fixes" into klp-docs	Katie McCormick	2013-11-26	4	-6/+6
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	Doc updates: Javadoc fixes	Katie McCormick	2013-11-26	4	-6/+6
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix typo nbChannels -> channelMask"	Glenn Kasten	2013-12-02	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix typo nbChannels -> channelMask	Glenn Kasten	2013-11-22	2	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Geoff Mendal	2013-12-02	4	-19/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2013-12-02	4	-19/+19
* \| \| \| \| \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2013-12-02	1	-1/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge commit '1ccc6633' into manualmerge	Jason Sams	2013-11-27	18	-202/+7538
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	am 9e6d8f04: Merge "Adding operations to reflected Renderscript class"	Jason Sams	2013-11-26	18	-251/+7539
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge "Adding operations to reflected Renderscript class"	Jason Sams	2013-11-26	18	-251/+7539
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	Adding operations to reflected Renderscript class	Matthieu Delahaye	2013-10-23	18	-251/+7539
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Geoff Mendal	2013-11-27	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2013-11-27	1	-4/+4
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am ad0cab26: am fdb738a5: am 752d8029: Merge "Doc update: minor changes to im...	Katie McCormick	2013-11-27	1	-18/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesso...	Katie McCormick	2013-11-26	1	-18/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs	Katie McCormick	2013-11-26	1	-18/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Merge "Doc update: minor changes to immersive lesson" into klp-docs	Katie McCormick	2013-11-26	1	-18/+6
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Doc update: minor changes to immersive lesson	Katie McCormick	2013-11-18	1	-18/+6
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Geoff Mendal	2013-11-27	1	-1/+1
\| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix sdk build.	Ying Wang	2013-11-26	1	-3/+2
\| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix header and footer dividers to match docs"	Alan Viverette	2013-11-26	1	-16/+16
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix header and footer dividers to match docs	Alan Viverette	2013-11-15	1	-16/+16
* \| \| \| \| \| \| \| \| \| \| \| \|	Generic object based data copy.	Jason Sams	2013-11-26	2	-234/+247
* \| \| \| \| \| \| \| \| \| \| \| \|	am 8e77393a: am 99ef026f: Merge "Keep PhoneStatusBar default constructor arou...	Dan Sandler	2013-11-26	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	am 99ef026f: Merge "Keep PhoneStatusBar default constructor around."	Dan Sandler	2013-11-26	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge "Keep PhoneStatusBar default constructor around."	Dan Sandler	2013-11-26	1	-0/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Keep PhoneStatusBar default constructor around.	John Spurlock	2013-11-26	1	-0/+1
\| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	am c1c23780: am 9d4ac970: Merge "Pass DNS server info notifications to observ...	Lorenzo Colitti	2013-11-26	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am 9d4ac970: Merge "Pass DNS server info notifications to observers."	Lorenzo Colitti	2013-11-26	4	-0/+90
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	Merge "Pass DNS server info notifications to observers."	Lorenzo Colitti	2013-11-26	4	-0/+90
\| \| \|\ \ \ \ \ \ \ \ \ \