OSDN Git Service

resolved conflicts for merge of 9e569fa9 to mnc-dev-plus-aosp
authorYabin Cui <yabinc@google.com>
Thu, 14 May 2015 06:34:19 +0000 (23:34 -0700)
committerYabin Cui <yabinc@google.com>
Thu, 14 May 2015 06:34:19 +0000 (23:34 -0700)
commit7bbc1ce9887f4c8537f4010bd237a8caf9e13013
tree243931875283cd649223d1e39095bacd8de8c9c6
parent01f644241d638bf5014e02e6404f60bbc3c04b52
parent9e569fa97bd48b043fb6a6d1af11902443e69d25
resolved conflicts for merge of 9e569fa9 to mnc-dev-plus-aosp

Change-Id: I56af6296b0cc8aeaf9517f344f8038ace3085eb2