| commit | e91c9c81846505df1ad160727a703139d5aa07ae | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 23 20:48:23 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Nov 23 20:48:23 2016 +0000 |
| tree | cc7d818981d28f41bfa3d73527d3ee34cf8a513c | |
| parent | 15ec31f9b1363b7fb0129f35e07ee37ad0909422 [diff] | |
| parent | a6accc74273168acf7c168f3aafe04a81cd5596d [diff] |
Merge "Move misc.cpp to the right place and fix build" into emu-master-dev
diff --git a/distrib/android-emugl/shared/emugl/common/misc.cpp b/android/android-emugl/shared/emugl/common/misc.cpp similarity index 100% rename from distrib/android-emugl/shared/emugl/common/misc.cpp rename to android/android-emugl/shared/emugl/common/misc.cpp
diff --git a/distrib/android-emugl/shared/emugl/common/misc.h b/android/android-emugl/shared/emugl/common/misc.h similarity index 100% rename from distrib/android-emugl/shared/emugl/common/misc.h rename to android/android-emugl/shared/emugl/common/misc.h