commit | a0c326f49b14fc8ed2e10a883beb84ad24ebebc3 | [log] [tgz] |
---|---|---|
author | Chris Banes <chrisbanes@google.com> | Thu Jun 30 21:01:04 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:01:04 2016 +0000 |
tree | 87469defe41de0c7295b8b80232384a654ed251d | |
parent | 6418f16ce9f462dd3f545337a2321df893adc285 [diff] | |
parent | 06a35ffe83de44c1bed0429dca001bcb46d73bca [diff] |
Merge \"Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE\" into nyc-dev am: 06a35ffe83 -s ours Change-Id: I5cc93ba7023f77d149617d416b70aa3ad46fcdcc