Dianne Hackborn 3b6a6bb594 resolved conflicts for merge of 6a3eddb4 to master ... Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e		2010-09-30 20:34:34 -07:00
cmds	KeyStore: Initialize IV correctly.	2010-09-30 17:28:01 +08:00
include	am 5d3cef8a: am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread	2010-09-30 18:12:28 -07:00
libs	am 5d3cef8a: am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread	2010-09-30 18:12:28 -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
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00