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

* commit '4832a0961dc891ef69177c9cf0c3e3ba5dd7b69d':
  DO NOT MERGE Fix lmp-preview-dev after bionic merge.
This commit is contained in:
Elliott Hughes 2014-06-04 18:43:41 +00:00 committed by Android Git Automerger
commit 9100b11973

Diff Content Not Available