tree e8ca639fba902e67a2f547816d5f1651c26e8624
parent 28a21e6bd7c3b051c1c205980da5054d9de380e0
parent 7aa4ac9f66d3b10e8a45a2c74be17e4e955b8910
author Adam Cohen <adamcohen@google.com> 1392411752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411752 +0000

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

* commit '7aa4ac9f66d3b10e8a45a2c74be17e4e955b8910':
  Fix new NPE relating to reorder hints