Steve Howard 4f0c27cb66 resolved conflicts for merge of 538c3fa3 to master ... Change-Id: I9190ca078ffd8b51515e3d53ac5753c05110c014		2010-09-30 14:41:59 -07:00
cmds	KeyStore: Initialize IV correctly.	2010-09-30 17:28:01 +08:00
include	Add support for transferring touch focus.	2010-09-27 16:10:17 -07:00
libs	Fix bug in split touches.	2010-09-28 13:41:00 -07:00
opengl	Initial checkin of a framerate test app	2010-09-28 14:59:20 -07:00
services/surfaceflinger	am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread	2010-09-24 18:13:22 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00