Uriel Rodriguez af0aec584a am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0 ...

* commit 'd814d4fa0c76a0384f7e32816e1ca36f237911c6':
  going directly to backup after face unlock fails 15 times

2011-10-17 11:31:19 -07:00

..

java

am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0

2011-10-17 11:31:19 -07:00

jni

Deprecate local-only CursorWindows.

2011-10-12 22:19:41 -07:00

res

Merge "Moving text cursor to nodpi" into ics-mr0

2011-10-14 15:12:13 -07:00

tests

Fix use of WebView.loadData() to avoid passing invalid encoding

2011-10-17 15:11:33 +01:00