tree 0d739593a5d416f0fff779cae9867bd4664a25b1
parent e9f1a6478fb0f6457fe085eddaa66e3f23081c00
parent 017823f67e9ecf98aea26200ec2ebdfc8b8e2c64
author Brad Fitzpatrick <bradfitz@android.com> 1279260344 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279260344 -0700

am f96c2719: am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread

Merge commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7'

* commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7':
  StrictMode: batch drop box writes for system apps