Merge "Merge "N is API 24" into nyc-dev am: bc983c4431 am: 528a5bd466" into nyc-mr1-dev-plus-aosp
am: a96bd319c6
* commit 'a96bd319c6032c99a57ab3b8ab212d2793c98777':
Change-Id: I83bf4eba7a2b2edcb62d79c4764635b88c138d2a
This commit is contained in: