OSDN Git Service

resolved conflicts for merge of 5366c20d to lmp-dev-plus-aosp
authorVladimir Marko <vmarko@google.com>
Thu, 11 Sep 2014 17:27:39 +0000 (18:27 +0100)
committerVladimir Marko <vmarko@google.com>
Thu, 11 Sep 2014 17:27:39 +0000 (18:27 +0100)
Change-Id: I65defc92aa4fcb61f3ddcbfde2851dd3fd6f2336


Trivial merge