tree 3eed5ba48c4e3aa30a0156d417e73b17bdca4f87
parent b6ced95a95c358adee147d4bfe21a0236a065e42
parent c2975a38507f8ee82e3fec1dba40ac7c5b9b4ba2
author Dan Willemsen <dwillemsen@google.com> 1555704730 -0700
committer android-build-merger <android-build-merger@google.com> 1555704730 -0700

Merge "Expose android.os.Build.VERSION.ACTIVE_CODENAMES to CTS" am: 644792c7d6
am: c2975a3850

Change-Id: I2c58d6c84d01d6f62ac081bd840386d27394cb39