tree 3056ba4a773f4d6b5ed03fcc08503bd21d699397
parent 59f3efc40dd3c15ac0ca6c6da42a5fea63458fc4
parent 23bc74a8d5c9086b3bddccc4b7554840e585fced
author Todd Kennedy <toddke@google.com> 1467147220 +0000
committer android-build-merger <android-build-merger@google.com> 1467147220 +0000

Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
am: 23bc74a8d5

Change-Id: Ic8648d5acff4afdb65074eb9313be082482e2b17