tree 89f84524158e5d42b4a4f450e12fc902b4334d7c
parent bbc13661504ef7cc8c397bd05f1ba33db619c77a
parent b608915d5dd1bb81c45b6f1406dd2e41f2e7c6cf
author Scott Main <smain@google.com> 1363220457 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363220457 -0700

am b608915d: 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

* commit 'b608915d5dd1bb81c45b6f1406dd2e41f2e7c6cf':
  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