tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 5fed2e0bc780de4ee8cbb2fb86d4c32b8adaafa5
parent ba57cabeac296e617caf73e38837e722b0b61a65
author Chris Wren <cwren@android.com> 1392410150 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410150 +0000

am ba57cabe: am be7049a9: am c95c80d1: Merge "backup widget assets." into jb-ub-now-indigo-rose

* commit 'ba57cabeac296e617caf73e38837e722b0b61a65':