tree 0360f3dfd21fbd88c61622cb964dd8ef9caab21b
parent 7ada3d2bba5f78ead6f6207d4fd322359dd8f7ad
parent f4b4825b4769cb2d9cf6fa3787e535f68f0f32a6
author Jason Sams <jsams@google.com> 1385578077 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385578077 -0800

am f4b4825b: am 5fe615c4: Merge "Fix histogram intrinsic."

* commit 'f4b4825b4769cb2d9cf6fa3787e535f68f0f32a6':
  Fix histogram intrinsic.