am 8f3ade0c: Merge "Follow StrictMode refactoring."

* commit '8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc':
  Follow StrictMode refactoring.
This commit is contained in:
Jeff Sharkey 2015-01-16 06:07:31 +00:00 committed by Android Git Automerger
commit 499127eab8
1 changed files with 1 additions and 1 deletions

View File

@ -57,7 +57,7 @@
#define PAD_SIZE(s) (((s)+3)&~3)
// Note: must be kept in sync with android/os/StrictMode.java's PENALTY_GATHER
#define STRICT_MODE_PENALTY_GATHER 0x100
#define STRICT_MODE_PENALTY_GATHER (0x40 << 16)
// Note: must be kept in sync with android/os/Parcel.java's EX_HAS_REPLY_HEADER
#define EX_HAS_REPLY_HEADER -128