tree 2fa9111ef079b24325d14f146a78e0e8f05adb84
parent 16384312244b8dccd53478a7bdeeb9a492821807
parent 794b587b37e3f32c081e5fdc084581be9d68292d
author Brian Carlstrom <bdc@google.com> 1390587754 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390587754 -0800

am 794b587b: Merge "Fix entry handling for 0 length entries."

* commit '794b587b37e3f32c081e5fdc084581be9d68292d':
  Fix entry handling for 0 length entries.