tree d2a61a77412ae9f6af00e89d43fcf0438454a8f5
parent 12de574edecd47d83142c8225a8200073123f3b6
parent f3dda7243c267a807d11a120219478f3a98f0275
author Katie McCormick <kmccormick@google.com> 1354495846 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354495846 -0800

am f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev

* commit 'f3dda7243c267a807d11a120219478f3a98f0275':
  Doc change: updating lib links