OSDN Git Service

Merge "N is API 24" into nyc-dev am: f211cae2ed
authorAdam Powell <adamp@google.com>
Thu, 26 May 2016 01:58:33 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 01:58:33 +0000 (01:58 +0000)
commit70fb7b81e3ee3db16d445c8d0caf895bacda9042
treec578b7ba6fbfee685e0368ea884db68e87d4f12b
parent2c1c188fe39270c2cdf9a698891f696dfc8e3cbb
parent233e8ae7624019592d1d090ceed4a39fee07b80a
Merge "N is API 24" into nyc-dev am: f211cae2ed
am: 233e8ae762

* commit '233e8ae7624019592d1d090ceed4a39fee07b80a':
  N is API 24

Change-Id: I3e74a44f57263a942b650dd3a1d6c874a5e0ad26