frameworks_native.git - frameworks/native

	Commit message (Expand)	Author	Age	Files	Lines
*	add OES postfix without truncating function	Jeff Boody	2011-05-11	1	-4/+6
*	Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"	James Dong	2011-05-11	0	-0/+0
\|\
* \	Merge "Update Calendars table to v300"	RoboErik	2011-05-11	0	-0/+0
\|\ \
* \ \	Merge "Add ROOT_ID to Accounts column"	John Reck	2011-05-11	0	-0/+0
\|\ \ \
* \ \ \	Merge "Expose the track informational event for testing"	James Dong	2011-05-11	0	-0/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge "fix libagl surface initialization"	Mathias Agopian	2011-05-11	1	-0/+4
\|\ \ \ \
\| * \| \| \|	fix libagl surface initialization	Mathias Agopian	2011-05-11	1	-0/+4
\| \|/ / /
* \| \| \|	am f450fd6a: am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configur...	Irfan Sheriff	2011-05-11	0	-0/+0
\|\ \ \ \
\| * \ \ \	am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat...	Irfan Sheriff	2011-05-11	0	-0/+0
\| \|\ \ \ \
\| \| * \ \ \	am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread	Irfan Sheriff	2011-05-11	0	-0/+0
\| \| \|\ \ \ \
\| \| \| * \ \ \	Merge "Move Wifi Ap configuration to flat file" into gingerbread	Irfan Sheriff	2011-05-11	0	-0/+0
\| \| \| \|\ \ \ \
* \| \| \| \ \ \ \	am 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link t...	Robert Ly	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board	Robert Ly	2011-05-11	0	-0/+0
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	am f3cdea93: am a45e4f4d: doc change: adding link to pic board	Robert Ly	2011-05-11	0	-0/+0
\| \| \|\ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	am a45e4f4d: doc change: adding link to pic board	Robert Ly	2011-05-11	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \
* \| \| \| \ \ \ \ \ \ \	am e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeyc...	Wink Saville	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE	Wink Saville	2011-05-10	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	Merge "Refactor IccRecords and IccCard" into honeycomb-LTE	Wink Saville	2011-05-10	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \
* \| \| \ \ \ \ \ \ \ \ \	am 041aa34e: am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap f...	Conley Owens	2011-05-11	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descripto...	Conley Owens	2011-05-10	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."	Conley Owens	2011-05-05	1	-0/+3
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	Merge "Add missing clean-up of idmap file descriptors."	Conley Owens	2011-05-05	1	-0/+3
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Add missing clean-up of idmap file descriptors.	Mårten Kongstad	2011-05-05	1	-0/+3
\| \| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp	Jake Hamby	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp	Jake Hamby	2011-05-10	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	am 4d53cb02: Merge "Enable support for SMS national language shift tables." i...	Jake Hamby	2011-05-05	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge "Enable support for SMS national language shift tables." into gingerbread	Jake Hamby	2011-05-05	0	-0/+0
\| \| \| \| \|_\|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	am 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge...	Eric Fischer	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised transl...	Eric Fischer	2011-05-10	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO N...	Eric Fischer	2011-05-10	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...	Eric Fischer	2011-05-10	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|/ / / / \| \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1	Eric Fischer	2011-05-10	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \ \ \
* \| \| \| \| \ \ \ \ \ \ \ \	am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised transl...	Eric Fischer	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" ...	Eric Fischer	2011-05-10	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycom...	Eric Fischer	2011-05-10	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2	Eric Fischer	2011-05-10	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \
* \| \| \| \ \ \ \ \ \ \ \ \ \	am 0fe56853: am 37c077d3: am 81faa44c: Merge "Move / copy some framework and ...	Joe Onorato	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui reso...	Joe Onorato	2011-05-10	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \|	am 81faa44c: Merge "Move / copy some framework and systemui resources from xl...	Joe Onorato	2011-05-10	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Merge "Move / copy some framework and systemui resources from xlarge to large...	Joe Onorato	2011-05-10	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
* \| \| \| \ \ \ \ \ \ \ \ \ \ \	am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeyco...	Robert Greenwalt	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE	Robert Greenwalt	2011-05-10	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix the adding of host routes." into honeycomb-LTE	Robert Greenwalt	2011-05-10	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \ \ \ \ \ \ \ \ \ \ \ \ \	Merge "Full local backup infrastructure"	Christopher Tate	2011-05-11	3	-3/+204
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Full local backup infrastructure	Christopher Tate	2011-05-10	3	-3/+204
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "resolved conflicts for merge of 037b54cf to master"	Dianne Hackborn	2011-05-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of 037b54cf to master	Dianne Hackborn	2011-05-11	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / \| \|/\| / / / / / / / / / / / / / / \| \| \|/ / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 652dbb7d: am 837bdc49: Merge "Fix scaling of batched motion events." into ...	Dianne Hackborn	2011-05-10	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2	Dianne Hackborn	2011-05-10	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix scaling of batched motion events." into honeycomb-mr2	Dianne Hackborn	2011-05-10	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \