commit | 9e0819bfaa03f0c0e100568772c804512c3887aa | [log] [tgz] |
---|---|---|
author | Chris Banes <chrisbanes@google.com> | Fri Jul 01 20:48:52 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 20:48:52 2016 +0000 |
tree | d03777adc948cd93e26fce3fcdbe50e178c1383c | |
parent | fbf63532de6f20393531fe5e34318624ba2dc9dd [diff] | |
parent | 307b9f19b95bbd225776774f4f558432209cbe74 [diff] |
Merge \\"Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE\\" into nyc-dev am: 06a35ffe83 -s ours am: 307b9f19b9 -s ours Change-Id: Ia21f0f06e74c07794b6050a7f8b2a7eab925f99d