OSDN Git Service

resolved conflicts for merge of dbe5f5ce to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Thu, 14 Aug 2014 18:00:31 +0000 (11:00 -0700)
committerAndreas Gampe <agampe@google.com>
Thu, 14 Aug 2014 18:00:31 +0000 (11:00 -0700)
commitc9c603847320f01d10789d065f23ef2d478bde82
tree2ed38c47303379381365666bbaca811fd37b536c
parent8c6b125a0aa49384376ab098647d470981831e5f
parentdbe5f5ce1752f56be2e03d7c644995488d82ddda
resolved conflicts for merge of dbe5f5ce to lmp-dev-plus-aosp

Change-Id: I85cb01de20f4c1b691db2813d21cb472db26edfc