tree a9de6cd2cde19646c9bdd6e0316cb44fc867bc33
parent f0cbb03ad251e6d69d8a41df3b57c6b33e0e5325
parent 714d655ccfcc0d465a1a8c190d407e3d97261d76
author Scott Main <smain@google.com> 1331852377 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331852377 -0700

am 714d655c: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1

* commit '714d655ccfcc0d465a1a8c190d407e3d97261d76':
  docs: Fix a bunch of misc doc issues from external tracker