Merge commit 'goog/master' into merge_master
Conflicts: opengl/libagl/Android.mk opengl/libs/Android.mk opengl/libs/egl_impl.h
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
#ifndef _UTILS_BACKUP_HELPERS_H
|
||||
#define _UTILS_BACKUP_HELPERS_H
|
||||
|
||||
int back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
|
||||
int back_up_files(int oldSnapshotFD, int oldDataStream, int newSnapshotFD,
|
||||
char const* fileBase, char const* const* files, int fileCount);
|
||||
|
||||
#define TEST_BACKUP_HELPERS 0
|
||||
|
Reference in New Issue
Block a user