tree 256f0fc4d97bcd8c72b2fb5ff71be4832e125d83
parent ed3f55f12d6dd702fed9d9ba21f5d2e333382e44
parent af1bd23bf55efc456727874f39f7e35d49ec2a85
author Scott Main <smain@google.com> 1363220372 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363220372 -0700

am af1bd23b: am e8319257: Merge "cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-docs

* commit 'af1bd23bf55efc456727874f39f7e35d49ec2a85':
  cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f