Go to file
Dianne Hackborn 923d3e4e36 am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:39:01 -07:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include DO NOT MERGE. Integrate add new screen width/height in "dp" configs. 2011-05-12 18:39:51 -07:00
libs DO NOT MERGE. Integrate add new screen width/height in "dp" configs. 2011-05-12 18:39:51 -07:00
opengl fix [4107131] nvidia driver call takes a very long time 2011-03-16 14:19:03 -07:00
services/surfaceflinger Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 2011-03-18 17:32:25 -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