Bjorn Bringert 97d1195832 Merge "Make SearchManager.getGlobalSearchActivity() public but hidden"

2010-01-19 00:58:39 -08:00

..

config

…

java

Merge "Make SearchManager.getGlobalSearchActivity() public but hidden"

2010-01-19 00:58:39 -08:00

jni

resolved conflicts for merge of d26707da to master

2010-01-12 11:53:42 -08:00

res

First pass at new device policy and administration APIs.

2010-01-17 15:10:24 -08:00