tree dbcc0d9f8a7851dbb5c8a8d8e9d1752ca5c7cc1b
parent 996274a611e29ce2ec7c4f6bdb5b3b30313a9a60
parent bdb308a059b64ed7fec1fb46a379d2fce9974c8d
author Kevin Hufnagle <khufnagle@google.com> 1474930532 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474930534 +0000

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