tree 969daadfb0aa17e1f435c5e2fe0832ce74ebd9f3
parent 9701c4ef1d72f731f3519cfb2036315b5f1f4f1e
parent 97bc628fa737a87b0b855b76404fd1527eca67f8
author Daniel Sandler <dsandler@android.com> 1380839964 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380839964 -0700

am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev

* commit '97bc628fa737a87b0b855b76404fd1527eca67f8':
  Goo goo ga joob.