OSDN Git Service

resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Thu, 24 Jul 2014 19:38:06 +0000 (12:38 -0700)
committerAndreas Gampe <agampe@google.com>
Thu, 24 Jul 2014 19:38:06 +0000 (12:38 -0700)

Trivial merge