| commit | e596433b9022932cd694f14659943df136376c9a | [log] [tgz] |
|---|---|---|
| author | Justin Morey <jmorey@google.com> | Thu Mar 19 03:07:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 03:07:24 2015 +0000 |
| tree | 472d7e108b56d794ba2a7c26dca9a3fd6285fd70 | |
| parent | 2c92413e72b8da760cd81fa77a71892faa95913a [diff] | |
| parent | abd5bbc4febe61f53641ac7c43160e161e12c1dc [diff] |
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