Jesse Hall c6694b4cb4 resolved conflicts for merge of e94d204a to master ... Change-Id: Idb2030dbb25a2e4b972492587558b25a305e68bd		2013-10-15 17:22:33 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am e4e91c4e: resolved conflicts for merge of e678897f to klp-dev-plus-aosp	2013-09-20 12:53:20 -07:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	am 1f1e5768: am 5d6aa951: Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev	2013-10-10 19:26:34 -07:00
libs	am 06c964d9: am 9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev	2013-10-10 19:41:28 -07:00
opengl	am a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev	2013-10-02 10:41:58 -07:00
services	resolved conflicts for merge of e94d204a to master	2013-10-15 17:22:33 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00