tree f3794c7636f7310877e691e3dc497ceae9693fdf
parent 47c320febd1f26f15f9c6b6e530e65bdc9b7b1b3
parent 7b48b5f6c85af10938ee8f90d29d7376de6d20f1
author Dianne Hackborn <hackbod@google.com> 1278725422 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278725422 -0700

am bbf0bde5: am faccac76: Make a stupid thing about the glue less stupid.

Merge commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7'

* commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7':
  Make a stupid thing about the glue less stupid.