tree f3cf59b407a8f052e40d17db32f09c1236e979cb
parent 9f2a22593119a17123cec180ff75cb6c02fb1ced
parent c38276177aeeda4326a54f1121790c154df04300
author Narayan Kamath <narayan@google.com> 1415796505 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415796507 +0000

Merge "Prune image cache if the boot marker is still in place." into lmp-mr1-dev