Dianne Hackborn 4d4f265e6b am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken ...

Merge commit '9f8cc518e14c7a34bc52da712afbf02d84585f67' into gingerbread-plus-aosp

* commit '9f8cc518e14c7a34bc52da712afbf02d84585f67':
  Adjust activity manager process OOM adj.

2010-06-11 10:58:48 -07:00

..

config

…

java

am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken

2010-06-11 10:58:48 -07:00

jni

Change camera interface to support multiple cameras.

2010-06-11 16:47:33 +08:00

res

Introduce "StrictMode"

2010-06-10 14:38:58 -07:00

tests

am ee7e6a78: merge from open-source master

2010-06-03 09:09:07 -07:00