tree e8ca639fba902e67a2f547816d5f1651c26e8624
parent f810f75ffa43533778c5507cac839a3f2e6f722c
parent d039b6e2546311cb197e93c01b9b2a8752225f0e
author Adam Cohen <adamcohen@google.com> 1392411275 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411275 +0000

am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints

* commit 'd039b6e2546311cb197e93c01b9b2a8752225f0e':
  Fix new NPE relating to reorder hints