tree 6c8d73f8532b9d55f64368d0b4244e1b845b4a2a
parent 22902f541e61bf9a1030fd87683102fe125ec135
parent 440f4dfac89c113b41f1a7259306b90b0cde8768
author Andy McFadden <fadden@android.com> 1378767546 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378767546 -0700

am 440f4dfa: Merge "Fix pixel test" into klp-dev

* commit '440f4dfac89c113b41f1a7259306b90b0cde8768':
  Fix pixel test