OSDN Git Service

am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
authorJustin Morey <jmorey@google.com>
Thu, 19 Mar 2015 02:47:00 +0000 (02:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Mar 2015 02:47:00 +0000 (02:47 +0000)
* commit '030b5493147d47a726e9f3e0e474772b29ad3111':
  Bump generic_x86_64 system partition size - DO NOT MERGE


Trivial merge