OSDN Git Service

resolved conflicts for merge of 7b04ae29 to lmp-dev-plus-aosp
authorIan Rogers <irogers@google.com>
Thu, 4 Sep 2014 17:31:03 +0000 (10:31 -0700)
committerIan Rogers <irogers@google.com>
Thu, 4 Sep 2014 17:31:03 +0000 (10:31 -0700)
commit150b8d4a17cf36f6b3a37237c88ead3626803b35
tree14821dbc71d7c7853842afefc2d299b1391a4d1e
parent1d1bee8d4df7de69f87bafb457d09bb0b19c925f
parent7b04ae299eb77786768ae05ba2498eb4eba6ddf6
resolved conflicts for merge of 7b04ae29 to lmp-dev-plus-aosp

Change-Id: I14be394092fb83ef2707614e3a9822acb4306d72