| commit | 292427b69f7b1a753c0636f916382e2a4f9648ba | [log] [tgz] |
|---|---|---|
| author | Justin Morey <jmorey@google.com> | Thu Mar 19 02:47:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 02:47:00 2015 +0000 |
| tree | 7a84887a9e37ba524528f673730c2f06b69e3b5e | |
| parent | 4cbc4b392da57c34626af38a4ea0fe4dc115af57 [diff] | |
| parent | 030b5493147d47a726e9f3e0e474772b29ad3111 [diff] |
am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev * commit '030b5493147d47a726e9f3e0e474772b29ad3111': Bump generic_x86_64 system partition size - DO NOT MERGE