tree 43a94a3fd193dc6e0de3281c7247564fc8810808
parent c15d923056c2a4b6beaf65ed0bde6576cf0e2ead
parent 5b90fc53e11be7741ba7e9674f155cd9d68566df
author John Reck <jreck@google.com> 1397765169 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397765169 +0000

am 5b90fc53: am 283b817c: am 1e088276: Fix testGetOpacity

* commit '5b90fc53e11be7741ba7e9674f155cd9d68566df':
  Fix testGetOpacity