OSDN Git Service

resolved conflicts for merge of 32912e0a to stage-aosp-master
authorMichael Wright <michaelwr@google.com>
Tue, 20 May 2014 05:42:58 +0000 (22:42 -0700)
committerMichael Wright <michaelwr@google.com>
Tue, 20 May 2014 05:42:58 +0000 (22:42 -0700)
commit889814cee0ebcf70069d04d3ae77c97c09efb5a1
tree5096380a92e2db4a6fa5500c0619632eb597e488
parent00fabcbeb035fb513293ea01d245002f40b3234f
parent32912e0a7308d2e0327b3273763f0b13fd0099c0
resolved conflicts for merge of 32912e0a to stage-aosp-master

Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
core/java/android/app/WallpaperManager.java