diff options
| author | Steven Moreland <smoreland@google.com> | 2016-10-25 15:45:19 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2016-10-26 12:05:29 +0200 |
| commit | 7a4f118c48e08fd3db62c82e3d56c1a8a300a171 (patch) | |
| tree | b645eff302c62b27abe27389050ce1e1bd4d7f2f /radio | |
| parent | 54813ed7c631ee5bfa499e87da65cacbf10efc9b (diff) | |
| download | android_hardware_interfaces-7a4f118c48e08fd3db62c82e3d56c1a8a300a171.tar.gz android_hardware_interfaces-7a4f118c48e08fd3db62c82e3d56c1a8a300a171.tar.bz2 android_hardware_interfaces-7a4f118c48e08fd3db62c82e3d56c1a8a300a171.zip | |
Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
Diffstat (limited to 'radio')
| -rw-r--r-- | radio/Android.bp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/radio/Android.bp b/radio/Android.bp new file mode 100644 index 000000000..bbb3e4bac --- /dev/null +++ b/radio/Android.bp @@ -0,0 +1,4 @@ +// This is an autogenerated file, do not edit. +subdirs = [ + "1.0", +] |