commit 024380b9329fc286f9f8f7f42bb96938f9bff745
author Scott Main <smain@google.com> Mon Aug 20 17:05:08 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 20 17:05:08 2012 -0700
tree 9c6537163feaa1ecdbdbebcbfd3f6e217aec8e0d
parent 7a4e83b235aeec6036440cb3b86311418f2e8c25
parent 1e44894605037bb3d1d3906bb559889643b0a4de

am 1e448946: am 50187e53: am f5089846: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c53ef9515aaeed734bea02c5d65e1e5

* commit '1e44894605037bb3d1d3906bb559889643b0a4de':
  docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c53ef9515aaeed734bea02c5d65e1e5