tree 60ef5e08d884461d338c615f7363919e9c130a18
parent 9d07eed168b6b0cf5006cd59cd95fdb4ba1e8b52
parent 1f397f4e7bedd65e81d1269927e88cd071a046f1
author TreeHugger Robot <treehugger-gerrit@google.com> 1467146916 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467146917 +0000

Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev