OSDN Git Service

Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
authorTodd Kennedy <toddke@google.com>
Tue, 28 Jun 2016 20:53:40 +0000 (20:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 20:53:40 +0000 (20:53 +0000)
am: 23bc74a8d5

Change-Id: Ic8648d5acff4afdb65074eb9313be082482e2b17


Trivial merge