The Android Automerger 33953a3f49 merge in master-release history after reset to 98e1ebc026		2014-05-03 05:50:49 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 44df726a: am cb079c89: Merge "Add instruction-set arguments to installd commands."	2014-05-01 14:05:10 +00:00
data/etc	am 1f9f945c: am 19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev	2014-05-01 21:37:35 +00:00
include	Merge "Move key attribute information out of native."	2014-04-29 22:31:18 +00:00
libs	Merge "Move key attribute information out of native."	2014-04-29 22:31:18 +00:00
opengl	Merge "Revert "Temporarily turn on callstack logging""	2014-04-24 23:49:19 +00:00
services	Merge "Improve SurfaceFlinger PTS estimation"	2014-05-02 17:59:23 +00:00
MODULE_LICENSE_APACHE2
NOTICE