tree 5f0d278a2b18d1085e82821e2099db29b150860f
parent 79e7c0a98e0ffd5af09dac4d6ab7a7449b93b472
author Elliott Hughes <enh@google.com> 1401422595 -0700
committer Elliott Hughes <enh@google.com> 1401422595 -0700

DO NOT MERGE Fix lmp-preview-dev after bionic merge.

Other projects in lmp-preview-dev are out of date, and it's easier to patch
bionic than to fix all of them.

Change-Id: Id55c3da7259ba0bb5e62462d5eca721d3716c07f