tree 7ed4b949b2f6804756df32a78d9d1499baec4ca5
parent 1dc8c62c5078f1598cc906de1b97b572cc3449a3
parent 76e95bbea6071eda65a62fc23b6a1a653c484d24
author Android (Google) Code Review <android-gerrit@google.com> 1248493921 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1248493921 -0700

Merge change 8564 into donut

* changes:
  Merge doc change from cupcake: commit 'a8d035ccf319e1aed685a1e1509681350f737fd1' into manualmerge