tree e810f9b38625f9c5bb15683e1170b29e18ee532f
parent 0db4ae817929e6dc624f2b1a491be456adbb3fd5
parent 4957b79ef6a75e56faa6a53ec66ebcb33b38f54b
author Adam Powell <adamp@google.com> 1464225764 +0000
committer android-build-merger <android-build-merger@google.com> 1464225764 +0000

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

* commit '4957b79ef6a75e56faa6a53ec66ebcb33b38f54b':
  N is API 24

Change-Id: I5d89f4b3adb5392641e7023e097f389b0a728ca7