tree 20ab5c69b55dbb7b1ca106ca06a970cc9445ee6b
parent 3bb2be7499bbefbb5b702eff974619067e1afd27
parent bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c
author Elliott Hughes <enh@google.com> 1377623750 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377623750 -0700

am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit 'bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c':
  Fix build with gcc-4.8 and array boundaries issue