tree d61de7005a3b33c8c242c0fd8a7d0490c4674f34
parent c2fc9870edb0527e3f0ac2825146a4c1936027cc
parent 8dc6e1bfa20d48babd6dd0f41bfc6de1a09cd67b
author Adam Cohen <adamcohen@google.com> 1406224883 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1406216169 +0000

Merge "Fix SecurityException when exiting wallpaper picker early" into ub-now-master