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)
commita8b5f7e73703c3d57086f7aded1749a0801dd997
tree957c5391ec43f5f7b1129fcf15025c5dc5cd7d6b
parent1d4a76c50f3f7d7cbc576e993239eb33f8456ff0
parentb699685ebd33f48c11c5cedcc2743efc374a682c
resolved conflicts for merge of b699685e to mnc-dev-plus-aosp

Change-Id: I1a298440130d6310523babdbbbf67c0fc1d8d48a