am 2d0e9339: am ea518a34: Merge "Fix potential NPE when saving fragment state."

* commit '2d0e93395dc1eb868fbc45e47ae32880f97c96f6':
  Fix potential NPE when saving fragment state.
tree: 793cdc696a3617c174b40d9f258ae8167614720f
  1. v13/
  2. v4/