| commit | b3ce4b1b7896fc22ac3fe1e06a61481f13f2d364 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Tue May 20 09:28:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 09:28:40 2014 +0000 |
| tree | 274dd3fcc257c668949eb9aa1831540846d389a0 | |
| parent | cd98ecc66b968c5d5d0d12522c4c8c9b848bf181 [diff] | |
| parent | 889814cee0ebcf70069d04d3ae77c97c09efb5a1 [diff] |
am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master * commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1': wallpaper: limit wallpaper width to sys.max_texture_size