summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix "find: `dummy': No such file or directory"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Daniel Sikorski2016-03-209-9/+9
* v4: Assign mDrawable before calling setBoundsstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kd34d2016-03-171-6/+1
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...staging/cm-13.0+r22Steve Kondik2016-03-101018-9428/+43827
|\
| * Avoid absolute path loading .so after M am: 405f6d6e7c am: 5ab545784dYang Ni2016-01-152-8/+11
| |\
| | * Avoid absolute path loading .so after M am: 405f6d6e7cYang Ni2016-01-152-8/+11
| | |\
| | | * Avoid absolute path loading .so after MYang Ni2016-01-152-8/+11
| | | |\
| | | | * Avoid absolute path loading .so after MYang Ni2016-01-152-8/+11
| * | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-160-0/+0
| |\| | |
| | * | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-1/+1
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| * | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-160-0/+0
| |\| | | |
| | * | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-1/+1
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| | | |/ / /
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-160-0/+0
| |\| | | |
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| | |/ / /
| * | | | [RenderScript] Load from the full path of librsjni and libRSSupport. am: aa35...Miao Wang2015-11-213-33/+75
| |\| | |
| | * | | [RenderScript] Load from the full path of librsjni and libRSSupport. am: aa35...Miao Wang2015-11-213-33/+75
| | |\| |
| | | * | [RenderScript] Load from the full path of librsjni and libRSSupport.Miao Wang2015-11-203-33/+75
| | | |\|
| | | | * [RenderScript] Load from the full path of librsjni and libRSSupport.Miao Wang2015-11-123-33/+75
| * | | | Merge "Reset SwipeRefreshLayout on window detaches." into mnc-ub-devAurimas Liutikas2015-11-201-11/+23
| |\ \ \ \
| | * | | | Reset SwipeRefreshLayout on window detaches.Aurimas Liutikas2015-11-191-11/+23
| * | | | | MediaRouter: Make getThemeColor() work properlySungsoo Lim2015-11-205-26/+50
| |/ / / /
| * | | | Merge "Initial proof-of-concept pass for TextViewCompat host testing." into m...Kirill Grouchnikov2015-11-195-0/+193
| |\ \ \ \
| | * | | | Initial proof-of-concept pass for TextViewCompat host testing.Kirill Grouchnikov2015-11-195-0/+193
| * | | | | Merge "Don't mutate StateListDrawables on API 7" into mnc-ub-devChris Banes2015-11-191-5/+4
| |\ \ \ \ \
| | * | | | | Don't mutate StateListDrawables on API 7Chris Banes2015-11-191-5/+4
| * | | | | | Merge "Copy over the wrapped drawable's bounds in wrap()" into mnc-ub-devChris Banes2015-11-192-4/+15
| |\ \ \ \ \ \
| | * | | | | | Copy over the wrapped drawable's bounds in wrap()Chris Banes2015-11-182-4/+15
| | |/ / / / /
| * | | | | | Merge "Don't animate TIL error if we've been given the same error" into mnc-u...Chris Banes2015-11-191-13/+26
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Don't animate TIL error if we've been given the same errorChris Banes2015-11-191-13/+26
| | |/ / / /
| * | | | | Merge "Make sure we keep Annotations in design's proguard" into mnc-ub-devChris Banes2015-11-181-0/+3
| |\ \ \ \ \
| | * | | | | Make sure we keep Annotations in design's proguardChris Banes2015-11-181-0/+3
| * | | | | | Merge "GuidedStep: sync selectorView translationY to focused view" into mnc-u...Dake Gu2015-11-1810-201/+125
| |\ \ \ \ \ \
| | * | | | | | GuidedStep: sync selectorView translationY to focused viewDake Gu2015-11-1810-201/+125
| * | | | | | | Fix a constructor of ForegroundLinearLayoutYuichi Araki2015-11-181-1/+1
| * | | | | | | Merge "MediaRouter: Fix for background colors of group volume controls" into ...Sungsoo Lim2015-11-181-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | MediaRouter: Fix for background colors of group volume controlsSungsoo Lim2015-11-171-2/+3
| * | | | | | | Merge "Prevent infinite loop in case of integer overflow." into mnc-ub-devDeepanshu Gupta2015-11-171-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent infinite loop in case of integer overflow.Deepanshu Gupta2015-10-301-1/+2
| * | | | | | | | Merge changes I05f4ebc0,I53e63fe0 into mnc-ub-devDake Gu2015-11-1716-68/+47
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Theme dark version of brand color and guided actions backgroundDake Gu2015-11-1614-66/+38
| | * | | | | | | GuidedStepFragment: fix temporary black screen in activity enterDake Gu2015-11-133-2/+9
| * | | | | | | | Merge "AppBarLayout fixes" into mnc-ub-devChris Banes2015-11-172-11/+38
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | AppBarLayout fixesChris Banes2015-11-172-11/+38
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge "MediaRouter: Make volume sliders move smoothly" into mnc-ub-devSungsoo Lim2015-11-171-58/+30
| |\ \ \ \ \ \ \
| | * | | | | | | MediaRouter: Make volume sliders move smoothlySungsoo Lim2015-11-171-58/+30
| * | | | | | | | Merge "Add elevation to leanback list dialogs" into mnc-ub-devTony Mantler2015-11-161-0/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Add elevation to leanback list dialogsTony Mantler2015-11-131-0/+2
| * | | | | | | | Merge "Make sure we honor canChildScrollUp()" into mnc-ub-devChris Banes2015-11-161-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make sure we honor canChildScrollUp()Chris Banes2015-11-131-1/+1