tree e810f9b38625f9c5bb15683e1170b29e18ee532f
parent bdde00191bdd4f17591cc643a87a274531fd0073
parent 9347ae615174564cf1eb2ab461a0efd5af462444
author Android Build Merger (Role) <android-build-merger@google.com> 1464228108 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464228109 +0000

Merge "Merge "N is API 24" into nyc-dev am: 4957b79ef6 am: 3b875f3f53" into nyc-mr1-dev-plus-aosp