tree 77adffce735fb0e6fc0add524660b0ed5466164e
parent c012a7ed7a06fe67098031f6858f998f0c9c66de
parent ade93296ffc3c4f56e804bac74383e2c01a0c111
author Kevin Hufnagle <khufnagle@google.com> 1474933058 +0000
committer android-build-merger <android-build-merger@google.com> 1474933058 +0000

Merge "docs: Added min/max values and descriptions for alpha getter/setter in ImageView" into nyc-dev
am: ade93296ff

Change-Id: I3e9630d9f5b7af61b84ba6cac558e6feff12f2c6