Filip Gruszczynski 0b6ccb4102 am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev ...

* commit '5ae61a811afca4fa7ddca1e4693f0b84fd09a6dc':
  Private Window flag to disable touch events in WallpaperService.

2014-12-09 00:17:18 +00:00

..

java

am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev

2014-12-09 00:17:18 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs

2014-12-09 00:16:54 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00