OSDN Git Service

resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp
authorStephen Hines <srhines@google.com>
Fri, 25 Jul 2014 18:53:48 +0000 (11:53 -0700)
committerStephen Hines <srhines@google.com>
Fri, 25 Jul 2014 18:53:48 +0000 (11:53 -0700)
Change-Id: Ifc9f9fa95dda1dbe60b3be35ef30d2ca707c72d5


Trivial merge