The Android Open Source Project 03c06bc9f4 Reconcile with jb-mr2-release - do not merge ... Change-Id: Ib28265f84583e4c1c8860f359145f38737817e99		2013-06-12 18:04:25 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 74bd799e: Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"	2013-05-28 15:46:14 -07:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	am 1c45dc66: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"	2013-05-29 18:33:33 -07:00
libs	am ef07386e: Prevent IPCThreadState::joinThreadPool from spinning on unexpected error	2013-06-11 20:09:27 -07:00
opengl	am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"	2013-05-13 13:05:36 -07:00
services	am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock	2013-05-17 13:53:31 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00