summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebaseDan Pasanen2016-12-05639-3733/+9017
|\
| * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-260-0/+0
| |\
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-230-0/+0
| | |\
| | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-170-0/+0
| | | |\
| | | | * Update build versions for support library 25Chris Flatt2016-10-141-2/+2
| | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-120-0/+0
| | | | |\
| | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-090-0/+0
| | | | | |\
| | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-040-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-020-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-280-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-250-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-220-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-210-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-200-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-180-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-150-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-140-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-130-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-110-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-080-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-070-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * Prevent prefetch crash with 0 childrenChris Craik2016-08-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | \ Merge changes Id091acf5,Ie27b07ae,I701a2582,I32122d77 into nyc-mr1-devAurimas Liutikas2016-10-267-55/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start using return value of OnNavigationItemSelectedListener.Aurimas Liutikas2016-10-264-9/+32
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up BottomBar docsChet Haase2016-10-261-2/+16
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force BottomNavigationView item labels to be singleLine.Aurimas Liutikas2016-10-264-29/+64
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean-up BottomNavigationMenuView#onMeasure and other style fixes.Aurimas Liutikas2016-10-252-16/+44
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Workaround getRefreshRate crash in edit mode - DO NOT MERGE" into nyc-...Chris Craik2016-10-251-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround getRefreshRate crash in edit mode - DO NOT MERGEChris Craik2016-10-241-3/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Updated support for animator in MediaNowPlayingView pre-Lollipop" into...Keyvan Amiri2016-10-255-191/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated support for animator in MediaNowPlayingView pre-LollipopKeyvan Amiri2016-10-125-191/+76
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View.SetLayoutDirection didn't update the drawable until API 19Teng-Hui Zhu2016-10-241-2/+3
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix usage of isAttachedToWindow() for API 9-11Chris Banes2016-10-211-2/+3
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Revert "MediaRouterButton: Make the button always enabled"Sungsoo Lim2016-10-161-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build versions for support library 25Chris Flatt2016-10-121-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Prevent prefetch of attached views." into nyc-mr1-devTreeHugger Robot2016-10-122-18/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Prevent prefetch of attached views.Chris Craik2016-10-112-18/+117
| | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "TextViewCompat - fix #getCompoundDrawablesRelative" into nyc-mr1-devTreeHugger Robot2016-10-112-1/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | TextViewCompat - fix #getCompoundDrawablesRelativeAndrei Stingaceanu2016-10-112-1/+26
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "MediaRouter: Use AppCompat's windowNoTitle attribute instead of framew...TreeHugger Robot2016-10-113-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | MediaRouter: Use AppCompat's windowNoTitle attribute instead of framework's oneDonghyun Cho2016-10-113-4/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |