tree f0f0a149508558585d5ed410fce87a2ba6bcebd3
parent fd3ca8acd43b7da78c30a02cecbedee45f8eb143
parent 10da5ab24c1db8cafbb45d1397621731ca00176d
author Marco Nelissen <marcone@google.com> 1475186726 +0000
committer android-build-merger <android-build-merger@google.com> 1475186726 +0000

Merge "Handle idle->loaded state transition when loaded->idle is still in progress" into nyc-mr1-dev
am: 10da5ab24c

Change-Id: If7e63fa885affbdc6649fb70636e20de85484a98