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