OSDN Git Service

am 4832a096: (-s ours) DO NOT MERGE Fix lmp-preview-dev after bionic merge.
authorElliott Hughes <enh@google.com>
Wed, 4 Jun 2014 18:43:41 +0000 (18:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 18:43:41 +0000 (18:43 +0000)
commit9100b1197355a83d276ed105e26f1b6351aeec39
tree5b415cb47d97c5119cab67a89058e7b8400e7b0f
parent88848df90232f214a466ce339ffc62e98d244d71
parent4832a0961dc891ef69177c9cf0c3e3ba5dd7b69d
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.