OSDN Git Service

resolved conflicts for merge of b699685e to mnc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Mon, 10 Aug 2015 20:04:27 +0000 (13:04 -0700)
committerElliott Hughes <enh@google.com>
Mon, 10 Aug 2015 20:04:27 +0000 (13:04 -0700)
Change-Id: I1a298440130d6310523babdbbbf67c0fc1d8d48a


Trivial merge