The Android Open Source Project 4ca0c72f2b am 65752b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ... * commit '65752b2b516204d890e59dbc395608d7dec0cff5':		2013-07-15 09:37:54 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Fix cmd line arguments for usagestats.	2013-07-12 12:19:44 -07:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	Merge "Pay attention to buffer timestamps"	2013-07-11 14:40:45 +00:00
libs	am 54d97c88: am 9da67a94: am 67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""	2013-07-11 10:16:47 -07:00
opengl	resolved conflicts for merge of 5477d0e4 to master	2013-07-11 09:40:54 -07:00
services	Merge "SurfaceFlinger: EventThread: Fix Vsync array size."	2013-07-12 23:31:57 +00:00
MODULE_LICENSE_APACHE2
NOTICE