diff options
| author | Nick Kralevich <nnk@google.com> | 2014-10-31 14:31:44 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-10-31 14:31:44 -0700 |
| commit | ce14f1f40793e18998ffe70dffb725a85bd15fdf (patch) | |
| tree | eed8f795578786c113abffab5e9c93375fb26c6f | |
| parent | 476d4de57bdc5592505e0c71e6d5ef65f4fdc70d (diff) | |
| parent | b8a3ce7833113135d7ce573aa52433351bb6e14b (diff) | |
| download | prebuilts_ndk-ce14f1f40793e18998ffe70dffb725a85bd15fdf.zip prebuilts_ndk-ce14f1f40793e18998ffe70dffb725a85bd15fdf.tar.gz prebuilts_ndk-ce14f1f40793e18998ffe70dffb725a85bd15fdf.tar.bz2 | |
resolved conflicts for merge of b8a3ce78 to lmp-mr1-dev-plus-aosp
0 files changed, 0 insertions, 0 deletions