tree 65d1f065aae991d42d10e055c89de4992652db92
parent 4d999fe696d43de5872f7be293e8a749cb69beaf
parent ad8f15e0b13383b2eaa2486b230debeae7a55661
author buzbee <buzbee@google.com> 1340230464 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340230464 -0700

Merge "Milestone: close Quick side channel communication" into ics-mr1-plus-art