tree c3353de867691f3ac9d03ea4c864c9cf6c7c8946
parent 151af19bf409a47424ddaa51e1ac4a0c532c4eb6
parent 7da2269176bffa4ade0a84537b305e13746173eb
author Scott Main <smain@google.com> 1273014217 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1273014217 -0700

Merge "docs: resolve doc bug bug:2648699" into froyo