tree 57ae9b84cfceef7062a9b021bf387ab50cdaad8f
parent 63621263824abb18226de53319899876c456fcb9
parent 74b936fbc59f81f296f5c6a3453c29785f9913ac
author Jason Parks <jparks@google.com> 1441317614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441317614 +0000

am 74b936fb: Fix failing CTS tests.

* commit '74b936fbc59f81f296f5c6a3453c29785f9913ac':
  Fix failing CTS tests.