Go to file
Christopher Tate d3e53c1884 am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
  Broaden the filter for wallpaper restore
2011-03-11 10:48:46 -08:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include Input improvements and bug fixes. 2011-03-09 18:30:28 -08:00
libs Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1 2011-03-10 18:06:32 -08:00
opengl Clean up use of HAVE_ANDROID_OS 2011-02-16 10:56:32 -08:00
services/surfaceflinger SurfaceFlinger: Respect the PROTECTED gralloc bit. 2011-03-10 16:25:48 -08: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