diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-01 12:25:10 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-04-01 12:25:10 -0700 |
| commit | bf07c7522e80eef53a58a49e5d05b8913d00d1a6 (patch) | |
| tree | fef6bdd9ca2927cb9681d8210e106e259f811913 /mini_mips.mk | |
| parent | 2874fd31491ce65591d430d82db697542a559a09 (diff) | |
| parent | 602eaa3dc2aa285d452e53dfef9f50af6ecc1b47 (diff) | |
| download | android_device_generic_mips-cm-13.0.tar.gz android_device_generic_mips-cm-13.0.tar.bz2 android_device_generic_mips-cm-13.0.zip | |
resolved conflicts for merge of 602eaa3d to masterHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-14.0stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0
Change-Id: I034975354c25efd940af7a459d90962bb81e031e
Diffstat (limited to 'mini_mips.mk')
0 files changed, 0 insertions, 0 deletions