tree f249a2ac8ce54e4b1920b3c5b25c328d7b1ad75a
parent 90d9ce81d0c35b282d48b77b8e7b8466bd758a7a
parent 12104d3734421ca9234c3c1933fa33c239329a48
author Scott Main <smain@google.com> 1328818739 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328818739 -0800

am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1

* commit '12104d3734421ca9234c3c1933fa33c239329a48':