tree 606948894c4521691015eca829b26674f38ef4fa
parent 40afb97c3289cd3daae9a31f4829d660ba747d37
parent dbad9d4e98bcaf47c54a8cc4860338fb25e8a96e
author Joe Fernandez <joefernandez@google.com> 1310076235 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310076235 -0700

Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2