tree 06478f26524d9d677529d0915793ca5914245f52
parent 3adf2172c35b1fae86244641c6bb051c8ba39041
parent 0a660528374f0cf4fc24eb610ea048c99cbd27a1
author Daniel Sandler <dsandler@android.com> 1380827991 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380827991 -0700

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

* commit '0a660528374f0cf4fc24eb610ea048c99cbd27a1':
  Goo goo ga joob.