Christopher Tate 152893dd66 am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev ...

* commit '93e5e859e3d2c0f4d4f47c90d370b38be4440655':
  Accept any restored wallpaper

2014-10-07 21:59:10 +00:00

..

java

am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev

2014-10-07 21:59:10 +00:00

jni

am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

2014-10-06 23:50:55 +00:00

res

am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3

2014-10-07 05:12:44 +00:00

tests

Fix issue #17752399: Multiple apps broken by GET_TASKS permission change

2014-10-03 16:26:04 -07:00