tree 013207c727707e91d4e7e07b84765cfa17e76a32
parent 13c8b7df5b51282c7ca606b1e6f3865a0de55dfb
parent 4f74f3fd589bb1048295959d2bf34e174292c7ab
author Rubin Xu <rubinxu@google.com> 1480371633 +0000
committer android-build-merger <android-build-merger@google.com> 1480371633 +0000

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

Change-Id: I30611734d78d3c3604cb3ef18ee732fb1ccc93b2