| commit | 775a698aac94458b1adc2fd59f7c2bde475d967e | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Thu Jun 30 21:04:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:04:41 2016 +0000 |
| tree | adafbe6ca9d526febd13c44178317188cbeec1ab | |
| parent | 19e3cdfb48b0fb65ccf35d189a1334c2b51e2138 [diff] | |
| parent | a0c326f49b14fc8ed2e10a883beb84ad24ebebc3 [diff] |
Merge \\"Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE\\" into nyc-dev am: 06a35ffe83 -s ours am: a0c326f49b -s ours Change-Id: I7efbe2ff39a8a281bfe98c8d39a17fd929fe4f02