diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-01 12:19:46 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-04-01 12:19:46 -0700 |
| commit | 0e7af778b59c0ff590e21fcce8cfc9176dc0d13d (patch) | |
| tree | baf85c541a55a05fa97a9e00202b45ae8a9871cf /mini_armv7a_neon.mk | |
| parent | 1ef6591e7fded42fc7751b0c6c2003e0fd72f142 (diff) | |
| parent | e2c7d491617321319ec4f7c3c67b746c2b5b6482 (diff) | |
| download | android_device_generic_armv7-a-neon-cm-13.0.tar.gz android_device_generic_armv7-a-neon-cm-13.0.tar.bz2 android_device_generic_armv7-a-neon-cm-13.0.zip | |
resolved conflicts for merge of e2c7d491 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-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0
Change-Id: I17cc5534c68d6cc1f35d294af7870b7037843525
Diffstat (limited to 'mini_armv7a_neon.mk')
0 files changed, 0 insertions, 0 deletions