Jamie Gennis 14bd369e4b Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev ... * changes: SurfaceTexture: fix an out of bounds array access surfaceflinger: refactor FrambufferSurface		2012-08-06 19:15:51 -07:00
..
android	Add ASSIST keycode.	2012-06-15 11:46:11 -07:00
binder	split-up Client.h out of SurfaceFlinger.h	2012-06-18 16:47:56 -07:00
cpustats	Fix log spam about CPU frequency on one device	2012-05-14 16:55:26 -07:00
gui	surfaceflinger: refactor FrambufferSurface	2012-08-06 18:55:01 -07:00
media	Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev	2012-07-28 09:55:54 -07:00
powermanager	Move services/powermanager from frameworks/base to frameworks/native	2012-03-28 13:58:23 -07:00
private	get rid of the shared-memory control block	2012-07-25 21:13:10 -07:00
ui	Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev	2012-07-28 09:55:54 -07:00
utils	libutils cleanup: remove unused or seldom used code from misc.{cpp|h}	2012-08-05 12:41:16 -07:00