tree 384cb1eb1c0eff5a6c3a7e2e182d76cbd2d9f80a
parent d97f85ceab74b9f39856cca3cb101139b19140b9
parent 6011acd88b95931f8c5ed471f479c8ae18435eea
author Marco Nelissen <marcone@google.com> 1475189952 +0000
committer android-build-merger <android-build-merger@google.com> 1475189952 +0000

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

Change-Id: I0ffdc054b857e67f4e1f18c187ed5f7f10fb4d81