OSDN Git Service

resolved conflicts for merge of d0ceb549 to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Fri, 12 Sep 2014 06:20:41 +0000 (23:20 -0700)
committerMathieu Chartier <mathieuc@google.com>
Fri, 12 Sep 2014 06:20:41 +0000 (23:20 -0700)
commit00b022ca2574d3eeacd411e79077203ddc7654e2
tree9fdaaada7ee9ba5e8c80453cd7efabf4eb2d6a38
parent624eb194f290fda131f69ec1d4c831a619e3c655
parentd0ceb5499f225f83e92c849eb04e7adb527eb2e3
resolved conflicts for merge of d0ceb549 to lmp-dev-plus-aosp

Change-Id: Ia0e6af178bfb0a8ecf655777d348912b74adfe4f