Go to file
Xavier Ducrohet 1c144773d2 am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit 'ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
2011-06-07 15:09:31 -07:00
cmds
include am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 2011-06-06 20:36:49 -07:00
libs am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 2011-06-06 20:36:49 -07:00
opengl fix [4107131] nvidia driver call takes a very long time 2011-03-16 14:19:03 -07:00
services/surfaceflinger am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 2011-06-07 15:02:53 -07:00
vpn Make VpnService synchronous API. 2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of 00118a48 to honeycomb-merge 2011-01-27 18:25:32 -08:00