tree cba62d0d64153aa2169651696bc238591341d679
parent ee81229929c454ad9e48a6fb3cf459f091e941d5
parent 7aa4ac9f66d3b10e8a45a2c74be17e4e955b8910
author Adam Cohen <adamcohen@google.com> 1414085540 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085540 +0000

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

* commit '7aa4ac9f66d3b10e8a45a2c74be17e4e955b8910':