Christopher Tate fc3cacdb0e am b990c001: am 3f91e43e: Merge "Full (local) restore security changes" into jb-mr1-dev ...

* commit 'b990c001e19cca13a139c1979a8a5e431d85a855':
  Full (local) restore security changes

2012-09-28 00:34:22 -07:00

..

java

am b990c001: am 3f91e43e: Merge "Full (local) restore security changes" into jb-mr1-dev

2012-09-28 00:34:22 -07:00

jni

am 40642722: am dd78d462: Fix JNI method signature.

2012-09-26 18:53:15 -07:00

res

Import translations. DO NOT MERGE

2012-09-27 22:14:38 -07:00

tests

Fix Wifi Stress test after wifi settings are moved to Settings.global

2012-09-26 09:23:59 -07:00