tree 81b24dfd6585babcc1e4e3294d9e081292483018
parent 139a5ec62afef58d1c0d59d6a3d6b09f141110a5
parent 2e11bb460cc8af9e9f4f122cf4e2d264e61943bc
author Yabin Cui <yabinc@google.com> 1429048529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429048529 +0000

am 5966e7e5: am 03e590a7: am 7369d314: Merge "Fix alignment when reading note segment."

* commit '5966e7e5f4a7d79986dbea3415f29a595b259877':
  Fix alignment when reading note segment.