tree 658374323d01d6f037a344d92afe313782c3aa54
parent cbd31aec9f4a7367d440bfb0c9683bd481461995
parent f197b639ecccc570ee235486f75ba15f87070c28
author Robert Ly <robertly@google.com> 1308089202 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308089202 -0700

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