Kenny Root 0375f93e18 resolved conflicts for merge of 06ef81bd to master ... Change-Id: Iecb252b38c98d6abe83f25927557b256183c2a01		2013-09-12 11:56:46 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am ecc05fb5: am 59b1516f: Fix issue #10422349: Limit/change the battery history data in batterystats	2013-09-04 18:32:12 -07:00
data/etc	Add NFC host-based card emulation feature.	2013-07-22 16:57:17 -07:00
include	am 7c4f2365: am 90ed3e8d: fix a few problems with BitTube	2013-09-11 17:24:11 -07:00
libs	Use canonical UniquePtr.h file	2013-09-11 23:25:08 -07:00
opengl	fix a possible null dereference when eglMakeCurrent() fails	2013-09-06 13:36:49 -07:00
services	am 7c4f2365: am 90ed3e8d: fix a few problems with BitTube	2013-09-11 17:24:11 -07:00
MODULE_LICENSE_APACHE2
NOTICE