Justin Ho 986c231b4a am e93f09d6: Merge "Update lockscreen assets" into ics-mr0 ...

* commit 'e93f09d66853f568eb253b458bd2cad2a34cb79a':
  Update lockscreen assets

2011-10-17 17:23:04 -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 lockscreen assets" into ics-mr0

2011-10-17 17:20:40 -07:00

tests

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

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