tree fdd0862b605eddcc1b20ba98ac3d73e936dd5340
parent 245af5e9ecb1881aa0b05f73bdbd249ec49a2af1
parent 52bee301b7ef870ec0acd86fda72352508369ce6
author Gloria Wang <gwang@google.com> 1300819389 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300819389 -0700

am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1

* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
  Add one more field in DecryptHandle to support bug 4126624