tree d5cd8687d4fcdd85ada602bf5b4393f38bb61b89
parent feb412c884ac7e75a667054ac37ac414083484f7
parent 88e641377ef42686e828bf8a55d7013819f6ed2f
author Aurimas Liutikas <aurimas@google.com> 1513127435 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513127435 +0000

Merge changes from topic "longdef-oc-mr1-jetpack-dev"

* changes:
  [automerger] Switch @IntDef from long to int, and add @LongDef am: df64f2ab05
  Switch @IntDef from long to int, and add @LongDef