tree adafbe6ca9d526febd13c44178317188cbeec1ab
parent c5f381796a04d373ced0388cfab13848007a8c35
parent 4daca8334842f10e514195adfc12904b5429db3b
author Android Build Merger (Role) <android-build-merger@google.com> 1467320710 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467320710 +0000

Merge "Merge \\"Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE\\" into nyc-dev am: 06a35ffe83  -s ours am: 43ad6461f2  -s ours" into nyc-mr1-dev-plus-aosp