tree 1f1ba33b53e8d0608f6d034f767a90c41eaf3fef
parent 66acffad765add93c8fc74592725eec901867393
parent 2baeb89882259661e17d7f631ae7f8987cf53c46
author Nick Kralevich <nnk@google.com> 1303934964 -0700
committer Nick Kralevich <nnk@google.com> 1303934964 -0700

resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp

Change-Id: Ib3169b3a36aa13ef413da624355b1737e9b76fd9