tree 4992ce2ad5b09b5d2c8465f216fef6609064d77d
parent 243924b08f9fbcc7f1e46d24df986c25fba3eb18
parent 233697471689a41a36f69cc9bda1e663d2f67804
author Joe Fernandez <joefernandez@google.com> 1342667664 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342667664 -0700

am 23369747: Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into jb-dev

* commit '233697471689a41a36f69cc9bda1e663d2f67804':
  docs: Updating <uses-sdk> docs, bug fix: b/6836256