tree c028bfe537607823c37e2ffc8c713c73059d3130
parent a59949c14ec618b1f6aed6b9f7828217b40ff1de
parent 78e865efc71199ed413ced4b34142e0dc0307b7d
author Sunny Goyal <sunnygoyal@google.com> 1422685280 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685280 +0000

am 78e865ef: am b141fb62: am d80f8258: am d3ad9828: Merge "Adding support to restore widgets even for jelly beans." into ub-now-porkchop

* commit '78e865efc71199ed413ced4b34142e0dc0307b7d':