From: Chen Xu <fionaxu@google.com>
Date: Wed, 30 Jan 2019 01:04:30 +0000 (-0800)
Subject: Merge "Add IntRange and FloatRange annotations" am: 94a9377222 am: 74798a771a
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=60a12e311818019d01f49b10bab90d7f348d658f;p=android-x86%2Fframeworks-base.git

Merge "Add IntRange and FloatRange annotations" am: 94a9377222 am: 74798a771a
am: 7c3084c349

Change-Id: Ic838b99e169e2fd144e51199e41560efdf663fea
---

60a12e311818019d01f49b10bab90d7f348d658f
diff --cc api/current.txt
index 74af09882c95,80f434ff5614..10d1697e36ee
mode 100644,100755..100644
--- a/api/current.txt
+++ b/api/current.txt