tree 5a213ba8d25c1f51aea02cd328e69a755ab06446
parent 5f00c3c7d70b33ad360e48908e23c796fced43bb
parent e83192577fbc1fc6e0a8d991f07be506605fa496
author Scott Main <smain@google.com> 1363220300 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363220300 -0700

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 'e83192577fbc1fc6e0a8d991f07be506605fa496':
  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