OSDN Git Service

resolved conflicts for merge of 743e4b08 to mnc-dr-dev-plus-aosp
authorSimon Wilson <simonwilson@google.com>
Wed, 29 Jul 2015 22:19:23 +0000 (15:19 -0700)
committerSimon Wilson <simonwilson@google.com>
Wed, 29 Jul 2015 22:19:23 +0000 (15:19 -0700)
commit043f5d95da0083d673b3c2ed63c5e9e2594ad00b
tree7b1f98acece392effa1503b25173cbf509e33112
parentb36ac88d6581ff504ab4196cef985512390d9097
parent743e4b08a47c203c55b3ee9694cf6bc197c0ed3e
resolved conflicts for merge of 743e4b08 to mnc-dr-dev-plus-aosp

Change-Id: I8a4408dc72545739e60da0a52f08c44b35f52ee0