frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 1cbea39f to master	Nick Kralevich	2014-02-12	2	-172/+218
\|\
\| *	resolved conflicts for merge of dd3d95f1 to klp-volantis-dev	Nick Kralevich	2014-02-12	2	-172/+218
\| \|\
\| \| *	Runtime resource overlay, iteration 2	Mårten Kongstad	2014-02-03	2	-172/+218
\| * \|	Fix build.	Dianne Hackborn	2014-02-11	1	-2/+2
\| \|/
* \|	Fix build.	Dianne Hackborn	2014-02-11	1	-2/+2
* \|	am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"	Dianne Hackborn	2014-02-11	2	-1/+26
\|\ \ \| \|/
\| *	New command line tool 'idmap'	Mårten Kongstad	2014-02-03	2	-1/+26
\| *	Change ResourceType cookies to int32_t.	Narayan Kamath	2014-01-31	2	-17/+17
\| *	AssetManager cookies should be int32_t and not void*.	Narayan Kamath	2014-01-27	1	-13/+12
\| *	Add libutils dependency for libandroidfw host build.	Narayan Kamath	2013-12-11	1	-2/+1
\| *	Reimplement ZipFileRO in terms of libziparchive.	Narayan Kamath	2013-12-09	7	-1004/+249
\| *	Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD	The Android Open Source Project	2013-11-22	23	-6048/+1776
\| \|\
\| * \|	Fix a variety of small publicly-reported bugs.	Elliott Hughes	2013-10-29	2	-12/+12
* \| \|	Extended locales in AAPT / AssetManager.	Narayan Kamath	2014-02-10	3	-46/+114
* \| \|	AssetManager support for 3 letter lang/country codes.	Narayan Kamath	2014-02-10	3	-45/+347
* \| \|	Change ResourceType cookies to int32_t.	Narayan Kamath	2014-01-28	2	-17/+17
* \| \|	AssetManager cookies should be int32_t and not void*.	Narayan Kamath	2014-01-27	1	-13/+12
* \| \|	Add libutils dependency for libandroidfw host build.	Narayan Kamath	2014-01-27	1	-2/+1
* \| \|	Reimplement ZipFileRO in terms of libziparchive.	Narayan Kamath	2014-01-27	7	-1004/+249
* \| \|	Re-apply androidfw fixes lost by the directory rearrangement.	Elliott Hughes	2014-01-27	2	-2/+2
* \| \|	Revert "move libandroidfw to frameworks/native"	Adam Lesinski	2014-01-27	19	-0/+14047
* \| \|	move libandroidfw to frameworks/native	Mike Lockwood	2013-10-03	19	-14047/+0
* \| \|	add a test for BackupData helpers.	Chris Wren	2013-09-25	2	-0/+439
\| \|/ \|/\|
* \|	Fix another off-by-one error in ZipFileRO	Kenny Root	2013-09-11	1	-1/+1
* \|	Reconcile differences between zip implementations	Kenny Root	2013-09-11	1	-65/+129
* \|	Revert "Reconcile differences between zip implementations"	Kenny Root	2013-09-11	1	-129/+65
* \|	Reconcile differences between zip implementations	Kenny Root	2013-09-11	1	-65/+129
* \|	Remove an unused C zip API.	Elliott Hughes	2013-08-05	2	-55/+0
* \|	Resource memory optimization.	Dianne Hackborn	2013-07-31	1	-83/+257
* \|	add static dependency on liblog	Colin Cross	2013-07-23	1	-0/+2
* \|	Move input library code to frameworks/native.	Jeff Brown	2013-07-01	17	-5957/+16
* \|	input: Handle a few extra error conditions.	Jeff Brown	2013-06-18	1	-2/+2
* \|	Move VelocityTracker.cpp to target build only	Nick Kralevich	2013-05-21	2	-3/+2
* \|	libutils clean-up	Mathias Agopian	2013-05-07	10	-6/+1488
* \|	Allow compiling aapt for the device	Bjorn Bringert	2013-04-26	2	-2/+5
\|/
*	Maybe fix issue #8620910: Win_sdk build failed and unable to create...	Dianne Hackborn	2013-04-15	1	-0/+2
*	Add new resources trace, also trace apk dex loading.	Dianne Hackborn	2013-04-12	1	-0/+12
*	Merge "Pipe through device resolution information" into jb-mr2-dev	Michael Wright	2013-04-05	1	-2/+2
\|\
\| *	Pipe through device resolution information	Michael Wright	2013-04-04	1	-2/+2
* \|	Correctly manage the lifecycle of IME InputChannels.	Jeff Brown	2013-04-04	1	-0/+5
\|/
*	DO NOT MERGE - Full backup/restore now handles OBBs sensibly	Christopher Tate	2013-03-08	1	-1/+1
*	am 8dda0956: am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read"	Kenny Root	2013-02-21	1	-4/+20
\|\
\| *	StreamingZipInflater: fix mmap'd end of read	Kenny Root	2013-02-15	1	-4/+20
* \|	am 75701e8f: am 7eb4db35: am b9185fd1: Merge "Fix PointerCoords Parcel incorr...	Jeffrey Brown	2013-02-06	1	-2/+2
\|\ \ \| \|/
\| *	am b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as In...	Jeffrey Brown	2013-02-06	1	-2/+2
\| \|\
\| \| *	Fix PointerCoords Parcel incorrectly storing values as Int32	Ilya Polenov	2013-01-30	1	-2/+2
* \| \|	Add initial plumbing for brightness keys	Michael Wright	2013-02-01	1	-0/+4
\|/ /
* \|	am d13b23a4: Merge "Revert "fix potential memory leak""	Elliott Hughes	2013-01-03	1	-3/+0
\|\ \ \| \|/
\| *	Revert "fix potential memory leak"	Elliott Hughes	2013-01-03	1	-3/+0
* \|	am 9aac0c1b: Merge "fix potential memory leak"	Elliott Hughes	2013-01-03	1	-0/+3
\|\ \ \| \|/