| commit | e929bee9bbb418b52fea877f5fff1449aab247fb | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Apr 28 14:15:06 2014 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Mon Apr 28 14:15:06 2014 -0700 |
| tree | 18defb24caf25e9effd0105a40c8a296eb22e494 | |
| parent | 812ad2265ed1386b347c98f48cc8a2b2925541b3 [diff] | |
| parent | 734a78fb867384dfb84f5f42f65b4681562d62b5 [diff] |
Merge commit '734a78fb' into manualmerge Conflicts: core/java/android/app/WallpaperManager.java Change-Id: Id103f540329ea484ff2e0829a0fc8158621f3dd3