tree 4700e3363f26d6cc69f6eccbf82db96dc39503f1
parent a2520db02bead68d4980783c41500ae96511bdf8
parent af06050932e00a03bed7b12c8ac86d90008052f2
author The Android Automerger <android-build@google.com> 1373460916 -0700
committer The Android Automerger <android-build@google.com> 1373460916 -0700

merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev