Justin Ho 9667c282a4 am e95a1190: Merge "Update unlock halo asset" into ics-mr0 ...

* commit 'e95a1190ff9e15ac0924cd7f294cf6a486e3119f':
  Update unlock halo asset

2011-10-17 17:23:15 -07:00

..

java

Merge "Return early when we cannot allocate a hardware layer Bug #5462308"

2011-10-17 17:11:08 -07:00

jni

Deprecate local-only CursorWindows.

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

res

Merge "Update unlock halo asset" into ics-mr0

2011-10-17 17:21:47 -07:00

tests

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

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