OSDN Git Service

resolved conflicts for merge of edc631c2 to lmp-mr1-dev-plus-aosp
authorStephen Hines <srhines@google.com>
Thu, 30 Oct 2014 21:35:35 +0000 (14:35 -0700)
committerStephen Hines <srhines@google.com>
Thu, 30 Oct 2014 21:35:35 +0000 (14:35 -0700)
commit32a2d5ed927dc586e26c01fe93c85815b542efed
tree0ce4542516bf1f030268a80b96cc9b43c6019511
parent98c0d2bab9bb8899258096bb808b6cd61e29221e
parentedc631c263dea64d0cd2f978785f70825d24d679
resolved conflicts for merge of edc631c2 to lmp-mr1-dev-plus-aosp