OSDN Git Service

Merge "Add @Nullable to return values in Uri" am: cfc6897a39
authorScott Kennedy <skennedy27@gmail.com>
Sat, 17 Feb 2018 07:58:31 +0000 (07:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Feb 2018 07:58:31 +0000 (07:58 +0000)
commit68636f2e8ab7ba35ef20cb76c0b8b747b608505f
tree94b3708e5c82a37d8a8553c940ddc3c4760fcf4e
parent4523bf284a19fd0db329d2c68b3e8a142582beb4
parenta03c35d74a0557a7f1e3e2e6e73adb2f5e935dda
Merge "Add @Nullable to return values in Uri" am: cfc6897a39
am: a03c35d74a

Change-Id: Ia145a065eabe75e72051287005cd5ab341fe2824
core/java/android/net/Uri.java