tree 6bf94becb10e4f018e5d3e05162a3881c765caac
parent 0399fcb48c125d0d176b09ed2e446ca80e5c864e
parent 18e39c2d23d68f7f754ea8b6194a8c6feb62bf8c
author Miao Wang <miaowang@google.com> 1429147072 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429147072 +0000

am 18e39c2d: am 79f7d687: Merge "[RenderScript] typo fix in Allocation.java"

* commit '18e39c2d23d68f7f754ea8b6194a8c6feb62bf8c':
  [RenderScript] typo fix in Allocation.java