aboutsummaryrefslogtreecommitdiffstats
path: root/checkpolicy/VERSION
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2019-03-04 20:13:36 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-03-04 20:13:36 -0800
commit4f7a3eaafc94f5c9dfeb06f0a3f5f404782d69be (patch)
tree39e41f75b170156710aa70a7244e7b1b5e9f075b /checkpolicy/VERSION
parentb4b9d8dc9c8d1bc15c4d83b32a0642439295e48d (diff)
parent1aa07b6989c5208a5699a38dd4dad3b246a92071 (diff)
downloadandroid_external_selinux-4f7a3eaafc94f5c9dfeb06f0a3f5f404782d69be.tar.gz
android_external_selinux-4f7a3eaafc94f5c9dfeb06f0a3f5f404782d69be.tar.bz2
android_external_selinux-4f7a3eaafc94f5c9dfeb06f0a3f5f404782d69be.zip
Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 356091588a
am: 1aa07b6989 Change-Id: I5722c0a20afea3b01ec68bfd60d41234e1ad405e
Diffstat (limited to 'checkpolicy/VERSION')
-rw-r--r--checkpolicy/VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/checkpolicy/VERSION b/checkpolicy/VERSION
index 29cba064..46aaabd0 100644
--- a/checkpolicy/VERSION
+++ b/checkpolicy/VERSION
@@ -1 +1 @@
-2.9-rc1
+2.9-rc2