tree f974b7965268f0f457736833e561902f8ec4147e
parent f9a31086ee3a903fb50907465e0f79441ddcf0ae
parent 5d1e292b8824c8038e649d145f8bb1123b5149b5
author Dianne Hackborn <hackbod@google.com> 1300414037 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300414037 -0700

am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1

* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(