OSDN Git Service

resolved conflicts for merge of a0eeb0b6 to lmp-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Thu, 28 Aug 2014 03:03:04 +0000 (20:03 -0700)
committerElliott Hughes <enh@google.com>
Thu, 28 Aug 2014 03:03:04 +0000 (20:03 -0700)
Change-Id: I84193689c0d6a9ee70b8da3c509694eb6d747d4a


Trivial merge