tree 74b2e4abeaeaa432f7f650a9350c5e9532811ba1
parent 75c59fb9d9a1408146165300eae0899a965897bf
parent 4129cfe1e4abf2366e395f36804a866b13241d28
author Scott Main <smain@google.com> 1371871545 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371871545 -0700

am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev

* commit '4129cfe1e4abf2366e395f36804a866b13241d28':
  add jb-mr2 api overview