tree cb7a03e9fa1a8d83aff5856a5bfc9277369ae43f
parent cf9ba6b32fbafaf62f6545ec8ae93c8381e5e83e
parent 754cb29c50f09a83251dd4bb633ba445b2411adb
author Aurimas Liutikas <aurimas@google.com> 1475028842 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1475028842 +0000

Merge "Switch from deprecated size annotations to new ones."