Go to file
Conley Owens a6aa9d9e66 am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '52749c0b1117a05a9c853b7d54f69a281f69cf3c':
  frameworks/base: acquire lock on am only when needed
2011-04-29 16:44:20 -07:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp 2011-04-12 10:27:15 -07:00
libs am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 2011-04-26 11:45:46 -07:00
opengl fix [4107131] nvidia driver call takes a very long time 2011-03-16 14:19:03 -07:00
services/surfaceflinger am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" 2011-04-27 13:41:12 -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