diff options
| author | Steven Moreland | 2016-10-25 17:45:19 -0500 |
|---|---|---|
| committer | Martijn Coenen | 2016-10-26 05:04:37 -0500 |
| commit | 69727778a74baacb880dffbd1c6692457932bf57 (patch) | |
| tree | a405157326d8fd32a064da21b60d31f6ad3d43db /thermal/Android.bp | |
| parent | 188ebec9948763f8287eeba84ff74b9a4aba3c4c (diff) | |
| download | platform-hardware-interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.gz platform-hardware-interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.xz platform-hardware-interfaces-69727778a74baacb880dffbd1c6692457932bf57.zip | |
Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
Diffstat (limited to 'thermal/Android.bp')
| -rw-r--r-- | thermal/Android.bp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/thermal/Android.bp b/thermal/Android.bp new file mode 100644 index 00000000..ba90f2c9 --- /dev/null +++ b/thermal/Android.bp | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | // This is an autogenerated file, do not edit. | ||
| 2 | subdirs = [ | ||
| 3 | "1.0", | ||
| 4 | "1.0/default", | ||
| 5 | ] | ||