am 2fd6dda0: (-s ours) am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev

* commit '2fd6dda03ef8b63b33bd36f7cfcf1f6ee365d571':
  DO NOT MERGE Don't take flags when creating app widget config activity.