tree dca211c2f95d880dee02b7d325ccef6f94ebb9ba
parent d879f542fffb9767057af25839da035050d7a0b4
parent a03b5be55c88fd50c65a07f63b36ce36a29ef0f4
author Chris Tate <ctate@android.com> 1474520171 +0000
committer android-build-merger <android-build-merger@google.com> 1474520171 +0000

Merge "Fix WallpaperManager APIs" am: 73e89cd290 am: 6e1400f43f am: 2cc80a362a
am: a03b5be55c

Change-Id: I275ff3e8b133084af043e36d20f3cbd2b91f161f