OSDN Git Service

Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev
authorTor Norbye <tnorbye@google.com>
Mon, 7 Aug 2017 16:24:25 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 16:24:25 +0000 (16:24 +0000)
commitdc2072c2a4a8417d4c94251066e9dc4085a00af8
treef2c6cc50d2713e3bf25978d2d94fe1d4fe7be226
parentda340cf040e70a3a64232c9c31eee5112ea4a3ff
parent708d1184581e9cff037ff2b7cb0aaac4b3dab99c
Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev
am: 708d118458

Change-Id: Ide1c1c97ce9388121e3b56b7773194c39a40bc22