tree e810f9b38625f9c5bb15683e1170b29e18ee532f
parent bd335e5e953725ff59d66c8226e2a8b164b29824
parent 3b875f3f533e1db220a030afc437fcbc5f82dafe
author Adam Powell <adamp@google.com> 1464228015 +0000
committer android-build-merger <android-build-merger@google.com> 1464228015 +0000

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

* commit '3b875f3f533e1db220a030afc437fcbc5f82dafe':
  N is API 24

Change-Id: I7c1fe5fc9abb1576c9c48dcee3c2cc94ad117b00