tree 19b88123cb343ffe31b80272df06be9659014bc1
parent a990867a8eca20a1877a38abefe6b1c1a7ef195e
parent ac07acac52d4a18af5ee17c06958558bc330f558
author Chris Banes <chrisbanes@google.com> 1467319697 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467319698 +0000

Merge "Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE" into nyc-dev