diff options
| author | 2008-12-19 08:31:54 -0800 | |
|---|---|---|
| committer | 2008-12-19 08:31:54 -0800 | |
| commit | 772a89695f179b51d16b26c1b0d946aa3e850e70 (patch) | |
| tree | 9a9fdadd1301625f875a3c126c986c79e3363ac4 /include/ui/Region.h | |
| parent | d34e59679f6a98e9e67ef4bd18da6e5a86d386bc (diff) | |
| parent | e09fd9e819c23dc90bca68375645e15544861330 (diff) | |
Merge commit 'remotes/korg/cupcake'
Conflicts:
core/java/com/android/internal/app/AlertController.java
core/res/res/values/strings.xml
media/java/android/media/AudioSystem.java
services/java/com/android/server/LocationManagerService.java
Diffstat (limited to 'include/ui/Region.h')
| -rw-r--r-- | include/ui/Region.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/Region.h b/include/ui/Region.h index a86e6300ff..a0c4608611 100644 --- a/include/ui/Region.h +++ b/include/ui/Region.h @@ -24,7 +24,8 @@ #include <utils/Parcel.h> #include <ui/Rect.h> -#include <ui/BlitHardware.h> + +#include <hardware/copybit.h> #include <corecg/SkRegion.h> @@ -166,7 +167,6 @@ private: } mutable Region::iterator i; }; - // --------------------------------------------------------------------------- }; // namespace android |