OSDN Git Service

resolved conflicts for merge of 6e5a42e6 to lmp-dev-plus-aosp
authorVince Harron <vharron@google.com>
Fri, 15 Aug 2014 05:59:12 +0000 (22:59 -0700)
committerVince Harron <vharron@google.com>
Fri, 15 Aug 2014 05:59:12 +0000 (22:59 -0700)
commit1552fdb352f16f800030063081a956019bab1f32
tree00d24b450c5e8ec84835d2c4430f5d9d6c299915
parent89b9a3308e3c3a78f5b75de658bb031ddd90857a
parent6e5a42e6948b434815d12663eeb792600531fe08
resolved conflicts for merge of 6e5a42e6 to lmp-dev-plus-aosp

Change-Id: I118c05111ded541c8b4cf3c5533c5a3de3b89322