tree c45c57e57309fcb0b20e33a9262564834accdc5f
parent 2039f1775421ee73c2ce22df9a3a83ac736e4011
parent c762e30727680e194add921b6353a790e6e4c787
author Robert Ly <robertly@google.com> 1308098704 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308098704 -0700

Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2