tree ece6ab340e02148eaeb8587bdf9eb477d9d6d885
parent 106bf64f4a5b4b7772c971f62b6207b5a73529a2
parent d21f9404da5c8cdc959b483a40876b02ced35e43
author Sunny Goyal <sunnygoyal@google.com> 1439580533 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439580533 +0000

am d21f9404: Merge "Disabling auto restore of widgets.   > Always show "Setup" button for a widget which has a config activity." into ub-launcher3-burnaby

* commit 'd21f9404da5c8cdc959b483a40876b02ced35e43':
  Disabling auto restore of widgets.   > Always show "Setup" button for a widget which has a config activity.