OSDN Git Service

am 11cf5ccd: resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp
authorChih-Hung Hsieh <chh@google.com>
Thu, 11 Dec 2014 22:44:42 +0000 (22:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Dec 2014 22:44:42 +0000 (22:44 +0000)
commitb6db895677d8b169883ee1d73b84888545fc6765
tree2235b3628109d04c7a62e836870630fef1129db3
parent8181b67f7f014005a5064463eb0b337c6e1caf3a
parent11cf5ccd5cd6dd1568bf69e4b6cbc27c95f5026d
am 11cf5ccd: resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp

* commit '11cf5ccd5cd6dd1568bf69e4b6cbc27c95f5026d':
  Cleanups needed to make clang happy