tree 0b37e84e2584a7d40de843d4e8bc61dbb5ff2c9b
parent 49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e
parent 8de169993f0078bfdd064499c48b9d124cb438be
author Tim Murray <timmurray@google.com> 1418765803 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418765803 +0000

am 8de16999: Merge "Fix typo with register native allocation."

* commit '8de169993f0078bfdd064499c48b9d124cb438be':
  Fix typo with register native allocation.