tree 5b58f2e412e6df4379d957feb36e39a36ca1867f
parent 38a410f12a1cbb5f49cdee6323da898b11c907e7
parent b6f0cbdcbb566368ebe0468f61de024f644db6e1
author The Android Open Source Project <initial-contribution@android.com> 1273524632 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273524632 -0700

am b6f0cbdc: merge from open-source master

Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken

* commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1':
  Include the API level 4 fields in the Parcel.