am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev

* commit '3eaa876cf317d064de1a32f1d34fd83b6e960e0b':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly