tree 03f0439c5dee1b0fb21368042ca0e772dffbe312
parent 87cffba830dac4b7526ff155433f60c16d0c4d72
parent 905da31a24479c559f88dfb46fb6dc94fb5c42b3
author Jean-Baptiste Queru <jbq@google.com> 1258313442 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258313442 -0800

am 905da31a: merge from open-source master

Merge commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3'

* commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3':
  Cosmetic fixes in css/js