tree ea5e8cd5613d61878747bb95028a2fc8868f6631
parent 20abc2a305e95aab12e18e247706d843e9aebace
parent 446004f35dc426ef8a8a470548a47e3817cecb22
author Brian Muramatsu <btmura@google.com> 1312395358 -0700
committer Brian Muramatsu <btmura@google.com> 1312395358 -0700

Merge remote branch 'goog/honeycomb-mr1' into manualmerge

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml

Change-Id: Idae96c502113b2bcd1e4a63c702f9b7f105133f5