Grace Kloba 23d57bd5c3 am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo ... Merge commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293' into kraken * commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293': Cherry-pick https://android-git.corp.google.com/g/#change,38305		2010-04-07 18:26:38 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Still do dump() if we cannot get mServiceLock for a while.	2010-03-05 15:21:02 -08:00
cmds	keystore: rephrase the comment to make the usage more clear.	2010-03-17 16:31:20 +08:00
common	Add test annotations to frameworks common tests.	2010-04-02 08:53:22 -07:00
include	fix [2545826] calling into gralloc with external lock held	2010-03-25 14:34:49 -07:00
libs	Make pixels prettier.	2010-04-05 18:12:27 -07:00
opengl	merge from open-source master	2010-03-31 14:01:45 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2
NOTICE