tree ebd4d739215332e242fa5cba88f95c0791873d42
parent bf3b856fe3b919fd5972b4d80899e10f7b2c4b29
parent cfcac8c23eb4aa8200fc2656a488cc92b80e417c
author Stephen Hines <srhines@google.com> 1440195939 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440195939 +0000

am cfcac8c2: am 2f011b0f: Merge "Fix a broken test due to RS header file updates."

* commit 'cfcac8c23eb4aa8200fc2656a488cc92b80e417c':
  Fix a broken test due to RS header file updates.