tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent 0a67a5f509dbe1406825a099d6a2a6c70b2ac48b
parent b8c7b5e19b6b9a272d962341e3ca0c0929ba7dee
author Joe Fernandez <joefernandez@google.com> 1329253576 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329253576 -0800

am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1

* commit '6a9beb536f13c4df178cbe67c74c30d258bef28f':