tree 7ede59cead67647272a0ae2d08b84856a72eac37
parent 92f5ec962e69bc0788b53c16a469ca48e64223e7
parent 5155b31cd96474459cff380621ebb9a77b2b7cbc
author Elliott Hughes <enh@google.com> 1356030216 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356030216 -0800

am 5155b31c: Merge "Change NewDirectByteBuffer to allow NULL if capacity == 0."

* commit '5155b31cd96474459cff380621ebb9a77b2b7cbc':
  Change NewDirectByteBuffer to allow NULL if capacity == 0.