Dan Stoza 3c7eb4fe23 am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp ... * commit '3372cc25df255b94e4eb75920afaf43ee5edc39f': SurfaceFlinger: Attempt to attribute fds to layers		2015-01-17 00:53:35 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	Use the timeout stack dump functions.	2015-01-15 15:35:40 -08:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	am 2f707415: am 806f23de: OpenMax IL: Added support for E-AC3 codec configuration params	2015-01-10 02:06:34 +00:00
libs	am 499127ea: am 8f3ade0c: Merge "Follow StrictMode refactoring."	2015-01-16 06:14:41 +00:00
opengl	am b9b86f64: am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""	2015-01-16 00:06:08 +00:00
services	am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp	2015-01-17 00:53:35 +00:00
MODULE_LICENSE_APACHE2
NOTICE