OSDN Git Service

resolved conflicts for merge of 912fe0a6 to lmp-mr1-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Wed, 29 Oct 2014 19:38:36 +0000 (12:38 -0700)
committerElliott Hughes <enh@google.com>
Wed, 29 Oct 2014 19:38:36 +0000 (12:38 -0700)
Change-Id: Ie1cc84f34ccaf27eae4f3c292d67d44a9f0276bc


Trivial merge