Adam Powell 32e15ba3c8 am d31320d5: (-s ours) am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2 ... * commit 'd31320d58fa3597962ed47d131aef6340beee4fa': DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.		2011-06-02 10:42:12 -07:00
cmds	Integrating keystore with keyguard (Part 1 of 4)	2011-06-01 14:29:59 -07:00
include	9-axis sensor fusion with Kalman filter	2011-05-27 17:04:55 -07:00
libs	Restore from a previous full backup's tarfile	2011-06-01 15:09:55 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge "Fix a race that could cause GL commands to be executed from the wrong thread."	2011-05-19 19:42:20 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00