Michael Wright 4f06e1a642 am 5a7ad73b: (-s ours) am 62fbb163: Shelve InputFlinger for another release. DO NOT MERGE ... * commit '5a7ad73bd2a8be38bc3c92c532ddeb1b50b1af3f': Shelve InputFlinger for another release. DO NOT MERGE		2014-08-19 01:47:26 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am c8c5e4c6: Merge "Add trace tag for power management." into lmp-dev	2014-08-16 03:14:00 +00:00
data/etc	Add OpenGL ES AEP feature xml.	2014-07-18 14:25:39 -07:00
include	am a0187a9c: Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""""	2014-08-13 00:19:23 +00:00
libs	am 703b60ce: Merge "Use gettid directly in binder."	2014-08-18 19:34:22 +00:00
opengl	am 45e2fc22: Revert "Modify EGL to disconnect the window when the surface gets destroyed."	2014-08-08 17:42:02 +00:00
services	Change output format to not throw warning on volantis.	2014-08-07 14:54:23 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00