OSDN Git Service

resolved conflicts for merge of b699685e to mnc-dr-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Mon, 10 Aug 2015 20:01:59 +0000 (13:01 -0700)
committerElliott Hughes <enh@google.com>
Mon, 10 Aug 2015 20:01:59 +0000 (13:01 -0700)
commitc795f109bcf2d4c8ad3e854f043fa8214effdb59
tree543f1d380a10bf16a894d315e14d6fd7a364bfd0
parent3ccfc70657c3b32c4a917ccd2290f5105eef57cc
parentb699685ebd33f48c11c5cedcc2743efc374a682c
resolved conflicts for merge of b699685e to mnc-dr-dev-plus-aosp

Change-Id: I4d517d1e17fc512730e9d9d61562cb6407a8729a