OSDN Git Service

resolved conflicts for b161297d to lmp-mr1-ub-dev
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 20:00:04 +0000 (13:00 -0700)
committerZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 20:00:04 +0000 (13:00 -0700)
commitf694d378955ddac3ee2651080bfa00c5ae39dddc
tree25717e681fb0619fe879112463952187667e20f4
parent17aa06f6fe0c10cb3bb84a11dfc78a88a4155adc
parentb161297d4be7de24f832a4aa7329a7278a41bec5
resolved conflicts for b161297d to lmp-mr1-ub-dev

Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
CleanSpec.mk
core/Makefile
tools/buildinfo.sh