Jaikumar Ganesh 6632362a8a am 32064b67: am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb ...

* commit '32064b6727127e275be23eb2eed18eabe84ee3b2':
  Temporary Changes for certification of SCO.

2011-01-21 15:47:59 -08:00

..

config

…

java

am 32064b67: am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb

2011-01-21 15:47:59 -08:00

jni

Merge "Switch from NetworkUtils to netd for iface config."

2011-01-21 12:06:16 -08:00

res

am a55e3670: am 0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb

2011-01-21 12:39:55 -08:00

tests

am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb

2011-01-21 14:28:52 -08:00