tree e810f9b38625f9c5bb15683e1170b29e18ee532f
parent bd335e5e953725ff59d66c8226e2a8b164b29824
parent 5b0007fbf268a8d1ad65db996acf7b0141dfe19d
author Adam Powell <adamp@google.com> 1464227855 +0000
committer android-build-merger <android-build-merger@google.com> 1464227855 +0000

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

* commit '5b0007fbf268a8d1ad65db996acf7b0141dfe19d':
  N is API 24

Change-Id: I3ced3af7e88582632ca6bb9804690372edcf2616