diff options
| author | 2009-05-27 14:34:50 -0700 | |
|---|---|---|
| committer | 2009-05-27 14:34:50 -0700 | |
| commit | 2da99bdaa1712f00525e6a84b58044332cb1baef (patch) | |
| tree | ed330500de06dc645769ea87372fb624390b52a8 /libs/rs/rsgApiReplay.cpp.rsg | |
| parent | 947f4f4d384ea26eb2145cc070a3eed42c59534a (diff) | |
| parent | cc77841f643751fd9f128e90f7d1587445ef353e (diff) | |
Merge commit 'goog/master' into merge_master
Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
Diffstat (limited to 'libs/rs/rsgApiReplay.cpp.rsg')
| -rw-r--r-- | libs/rs/rsgApiReplay.cpp.rsg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/rs/rsgApiReplay.cpp.rsg b/libs/rs/rsgApiReplay.cpp.rsg new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/libs/rs/rsgApiReplay.cpp.rsg @@ -0,0 +1 @@ +3 |