Craig Mautner c5e73bf9f8 am da506ffa: am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing" ...

* commit 'da506ffabadd551241e23aecf08e378e7d0f30b1':
  Prevent infinite layout and wallpaper flashing

2015-04-21 15:41:26 +00:00

..

java/com/android/server

am da506ffa: am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"

2015-04-21 15:41:26 +00:00

jni

Revert "A bunch more cleanups"

2015-04-17 20:47:27 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00