tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent 2a15f0fb9329ffdeb1a756afce6df639fc185386
parent 0953e899344dab69ad5232f33383fdf869a224a3
author Gloria Wang <gwang@google.com> 1300817072 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300817072 -0700

Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1