OSDN Git Service

resolved conflicts for merge of acb5f383 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Sat, 5 May 2012 02:16:35 +0000 (19:16 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 5 May 2012 02:18:00 +0000 (19:18 -0700)
commite7339d804dc91427330abe192ebbb6bcd56b822c
tree336026cd882d9d12b7ae80a3d7a7e3c6e3dbcbea
parentf9d5ee556a7cc588b19ca3ba92931bd562699f1c
parentacb5f383eaaf6c8251dde9cb12909a1a9ea0d652
resolved conflicts for merge of acb5f383 to jb-dev-plus-aosp

Change-Id: I79f0394b20a61dc7e6faabdb74c66277f71dfcb3
packages/SystemUI/src/com/android/systemui/ImageWallpaper.java