tree e93071f502fcadc81fd0a52afb75f01a10e66a4b
parent 5445ec061b728ce094ae1f39b0bba564fcbd34e1
parent bdde00191bdd4f17591cc643a87a274531fd0073
author Adam Powell <adamp@google.com> 1464229284 +0000
committer android-build-merger <android-build-merger@google.com> 1464229284 +0000

Merge "N is API 24" into nyc-dev am: 4957b79ef6 am: 5b0007fbf2
am: bdde00191b

* commit 'bdde00191bdd4f17591cc643a87a274531fd0073':
  N is API 24

Change-Id: I548e712cda8f7a0818a9ba19f6e47b9338e48a0a