tree f412364c413e39abb276027c8f22c8c7d7ffc4c9
parent bbcc4ed4934a8b2faae5eabcb96fb6816de9b03c
parent a5b9e3ebc2c6d800c53325df9e0ad55a6608ae94
author Brian Muramatsu <btmura@google.com> 1302903406 -0700
committer Brian Muramatsu <btmura@google.com> 1302903406 -0700

resolved conflicts for merge of a5b9e3eb to honeycomb-mr1

Change-Id: Ibb83d18811099872fa30c2ee6cb90a3fd5f8e163