am a856c6f5: (-s ours) DO NOT MERGE Fix lmp-preview-dev after bionic merge.

* commit 'a856c6f543c71f6778cdb9b39f6049ae8b2c4e53':
  DO NOT MERGE Fix lmp-preview-dev after bionic merge.
This commit is contained in:
Elliott Hughes 2014-05-30 11:24:05 +00:00 committed by Android Git Automerger
commit 2759e6033d

Diff Content Not Available