tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent a0ab9eb96f6b448a772dd05661ed0f2c1120853e
parent 622c97d7695739844077fe6e76dfc080ace60a47
author repo sync <fredq@google.com> 1300913192 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300913192 -0700

Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp