tree 10cc3b5963a31715af75181e4d76b9343e19ce42
parent 92529363d0622712a4e79232f91cf9c17564a20c
parent dce92891df42d5ad8cdcb6ecade5b2801a14f090
author Jorim Jaggi <jjaggi@google.com> 1462579678 +0000
committer android-build-merger <android-build-merger@google.com> 1462579678 +0000

Merge "Fix minimized state messup" into nyc-dev
am: dce92891df

* commit 'dce92891df42d5ad8cdcb6ecade5b2801a14f090':
  Fix minimized state messup

Change-Id: I8aba9be1767593da365c3192bfaa89821f8bf527