commit | a2178f3a37c6083d4665b213e21719143dc7b352 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 30 21:05:10 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 30 21:05:10 2016 +0000 |
tree | adafbe6ca9d526febd13c44178317188cbeec1ab | |
parent | c5f381796a04d373ced0388cfab13848007a8c35 [diff] | |
parent | 4daca8334842f10e514195adfc12904b5429db3b [diff] |
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