tree 10da860fcff71886af91d082e31f0e1917926848
parent e472e54e9b441ce007f80d4a8cd9660e3a7bf638
parent e6d2305f6240c9b63a2d9aec80a59676778e3712
author Adam Cohen <adamcohen@google.com> 1414566429 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566429 +0000

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

* commit 'e6d2305f6240c9b63a2d9aec80a59676778e3712':