diff options
author | Justin Morey <jmorey@google.com> | 2015-03-19 03:07:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 03:07:24 +0000 |
commit | e596433b9022932cd694f14659943df136376c9a (patch) | |
tree | 472d7e108b56d794ba2a7c26dca9a3fd6285fd70 /CleanSpec.mk | |
parent | 2c92413e72b8da760cd81fa77a71892faa95913a (diff) | |
parent | abd5bbc4febe61f53641ac7c43160e161e12c1dc (diff) | |
download | build-e596433b9022932cd694f14659943df136376c9a.zip build-e596433b9022932cd694f14659943df136376c9a.tar.gz build-e596433b9022932cd694f14659943df136376c9a.tar.bz2 |
am abd5bbc4: am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
* commit 'abd5bbc4febe61f53641ac7c43160e161e12c1dc':
Bump generic_x86_64 system partition size - DO NOT MERGE
Diffstat (limited to 'CleanSpec.mk')
0 files changed, 0 insertions, 0 deletions