am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with Keep." into lmp-dev

* commit 'f66b0e5f71be61e496bd8b77f04384ea14b75da7':
This commit is contained in:
Jean Chalard 2015-03-20 23:23:48 +00:00 committed by Android Git Automerger
commit db356aed1f

Diff content is not available