tree dcb724183e31b6d8349c037afbc83b967e728b04
parent 1a8bdf8bf90f4263785895ff353730d4fb6cee84
parent 492f5263a44bc5125140ab9a7cabdb8626435eca
author Rubin Xu <rubinxu@google.com> 1480370491 +0000
committer android-build-merger <android-build-merger@google.com> 1480370491 +0000

Fix boot loop when upgrading direclty from L to N am: bfc7faaf35
am: 492f5263a4

Change-Id: I22ddb905cf6ff4519dd12e84f5a51ea27d256602