OSDN Git Service

resolved conflicts for merge of 5974d730 to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Sat, 30 Aug 2014 18:34:52 +0000 (11:34 -0700)
committerMathieu Chartier <mathieuc@google.com>
Sat, 30 Aug 2014 18:34:52 +0000 (11:34 -0700)
commitc18819b204435f67425a1faf53d402e042613348
tree2a23d7ccb12d940f334e51d0c794d4c02ff42b49
parentbff03fb5da49df07447a6bc12c31134e47ec38c8
parent5974d730f5d0206681cc3a60ba21dd42d8ba3331
resolved conflicts for merge of 5974d730 to lmp-dev-plus-aosp

Change-Id: I415996d240a32c2ab7b66e25c824b42c908094dd