tree 1c9b2de8bbb990d15024a3e4677846e91d1addaa
parent d8e7c5f1246f3094772b7630d7df2b0554261c53
parent 3ac982d9455cb18d1c9ca10e695770d72fe21c90
author Ficus Kirkpatrick <ficus@android.com> 1424020327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424020327 +0000

am 3ac982d9: Merge "Use the view size and scale type to restrict NIV requests."

* commit '3ac982d9455cb18d1c9ca10e695770d72fe21c90':
  Use the view size and scale type to restrict NIV requests.