diff options
| author | Xavier Ducrohet <xav@google.com> | 2013-12-04 02:39:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-04 02:39:16 +0000 |
| commit | c22036f5b99f23fa2ff8de5fb796602e7a636a2e (patch) | |
| tree | 53c781e7f2ae603d81511151c7a071b590c9f71d | |
| parent | cfd0c7e0aaa29ffb314b948f7da269f8a2b85a70 (diff) | |
| parent | 8fb9c3ae1116ed608261a41e7602f06502a8546b (diff) | |
| download | build-c22036f5b99f23fa2ff8de5fb796602e7a636a2e.tar.gz | |
Merge "rename temporary Android.mk file to not break the build."
| -rw-r--r-- | tests/ndkRsHelloCompute/Android.mk.old (renamed from tests/ndkRsHelloCompute/Android.mk) | 0 | ||||
| -rw-r--r-- | tests/ndkRsHelloCompute/libhellocomputendk/Android.mk.old (renamed from tests/ndkRsHelloCompute/libhellocomputendk/Android.mk) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/ndkRsHelloCompute/Android.mk b/tests/ndkRsHelloCompute/Android.mk.old index 5dbe19f..5dbe19f 100644 --- a/tests/ndkRsHelloCompute/Android.mk +++ b/tests/ndkRsHelloCompute/Android.mk.old diff --git a/tests/ndkRsHelloCompute/libhellocomputendk/Android.mk b/tests/ndkRsHelloCompute/libhellocomputendk/Android.mk.old index 1c0e861..1c0e861 100644 --- a/tests/ndkRsHelloCompute/libhellocomputendk/Android.mk +++ b/tests/ndkRsHelloCompute/libhellocomputendk/Android.mk.old |