Dave Sparks 6698d16b95 resolved conflicts for merge of 04c7d0f8 to master

2009-07-08 17:26:05 -07:00

..

audioflinger

am a5188a09: Merge change 6367 into donut

2009-07-07 12:14:01 -07:00

binder

new Permission class used to improve permission checks speed (by caching results)

2009-06-15 21:56:51 -07:00

rs

Merge commit 'goog/master' into merge_master

2009-07-06 14:16:55 -07:00

surfaceflinger

trying to fix the sim, I'm not even sure this syntaxe is valid, but my compilo doesn't complain

2009-07-06 19:04:55 -07:00

ui

resolved conflicts for merge of 04c7d0f8 to master

2009-07-08 17:26:05 -07:00

utils

am 991eec03: Merge change 6252 into donut

2009-07-06 14:10:36 -07:00