diff options
| author | Nick Kralevich <nnk@google.com> | 2014-10-31 21:39:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 21:39:21 +0000 |
| commit | c009da2533754ef9ee4ac648187fdd045136b87c (patch) | |
| tree | eed8f795578786c113abffab5e9c93375fb26c6f /8/sources | |
| parent | 61a458b03de40d73fd3bd9c8748f382ce35037d9 (diff) | |
| parent | ce14f1f40793e18998ffe70dffb725a85bd15fdf (diff) | |
| download | prebuilts_ndk-c009da2533754ef9ee4ac648187fdd045136b87c.zip prebuilts_ndk-c009da2533754ef9ee4ac648187fdd045136b87c.tar.gz prebuilts_ndk-c009da2533754ef9ee4ac648187fdd045136b87c.tar.bz2 | |
am ce14f1f4: resolved conflicts for merge of b8a3ce78 to lmp-mr1-dev-plus-aosp
* commit 'ce14f1f40793e18998ffe70dffb725a85bd15fdf':
Add real android-21 32-bit headers/libs
Diffstat (limited to '8/sources')
0 files changed, 0 insertions, 0 deletions