OSDN Git Service

resolved conflicts for merge of 68000907 to lmp-mr1-dev
authorJustin Morey <jmorey@google.com>
Thu, 19 Mar 2015 18:31:18 +0000 (18:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Mar 2015 18:31:18 +0000 (18:31 +0000)
commitd461d4f03411f347770eca66fc2e63f1f371b7fd
tree494e27c67b6da7b7c32cc188db223a56bccf1a7b
parentab0b128073f02231248f3abbcd88165aa3690ca1
parent030b5493147d47a726e9f3e0e474772b29ad3111
resolved conflicts for merge of 68000907 to lmp-mr1-dev
automerge: 030b549

* commit '030b5493147d47a726e9f3e0e474772b29ad3111':
  Bump generic_x86_64 system partition size - DO NOT MERGE