Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
5648b12da1357345b06ff86d41ff70a92d803093
5648b12
resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp
by Dan Albert
· 10 years ago
e9b6cb8
am ad64befd: am 296a712e: Merge "Make a field final."
by Ian Rogers
· 10 years ago
86d0708
am b38e8d02: am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
by Svetoslav
· 10 years ago
5f95026
am 7e3752e6: am 24a306c5: am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev
by Dianne Hackborn
· 10 years ago
52dc625
am e5350332: am 63f3936c: am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev
by Svetoslav
· 10 years ago
9430598
am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
by Svetoslav
· 10 years ago
1aab9db
am 24a306c5: am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev
by Dianne Hackborn
· 10 years ago
06be8ab
am 63f3936c: am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev
by Svetoslav
· 10 years ago
8791ebf
am bcaaebb8: Merge "Clean up test makefiles."
by Dan Albert
· 10 years ago
ad64bef
am 296a712e: Merge "Make a field final."
by Ian Rogers
· 10 years ago
479ab3b
am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
by Svetoslav
· 10 years ago
3acb494
am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev
by Dianne Hackborn
· 10 years ago
cfcce6b
am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev
by Svetoslav
· 10 years ago
129ffeb
am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev
by Svetoslav
· 10 years ago
662b13b
am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev
by Dianne Hackborn
· 10 years ago
518b9dd
am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev
by Svetoslav
· 10 years ago
02c377e
am 6ba1531e: am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev
by George Mount
· 10 years ago
f05822e
am db6c7541: am 84dc7b17: am 4e6d1f66: am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev
by Jeff Sharkey
· 10 years ago
1258dd2
Merge "Keep existing API behavior that regressed." into lmp-dev
by Svetoslav
· 10 years ago
79572af
Merge "Add new activity dumpsys command to persist all data." into lmp-dev
by Dianne Hackborn
· 10 years ago
451bf37
Merge "Fix a print spooler crash when printing." into lmp-dev
by Svetoslav
· 10 years ago
6de4a2a
am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev
by George Mount
· 10 years ago
36e807e
am 84dc7b17: am 4e6d1f66: am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev
by Jeff Sharkey
· 10 years ago
f2a6e1f
am 80b7068b: am 8f7fb2e6: am 7fd5ca87: am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev
by Alan Viverette
· 10 years ago
9424b73
Fix a print spooler crash when printing.
by Svetoslav
· 10 years ago
56d1c8a
am 8f7fb2e6: am 7fd5ca87: am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev
by Alan Viverette
· 10 years ago
02c1728
am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev
by George Mount
· 10 years ago
ffa8214
am 4e6d1f66: am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev
by Jeff Sharkey
· 10 years ago
764b994
am b501fb2d: am 6caa43be: am 0a296ef3: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev
by Adam Powell
· 10 years ago
6826e9b
am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev
by George Mount
· 10 years ago
179a082
am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev
by Jeff Sharkey
· 10 years ago
db58354
am 7fd5ca87: am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev
by Alan Viverette
· 10 years ago
46aaaf7
am 6caa43be: am 0a296ef3: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev
by Adam Powell
· 10 years ago
615a2c1
Merge "Target only shared elements with shared element Transition" into lmp-dev
by George Mount
· 10 years ago
b624244
Keep existing API behavior that regressed.
by Svetoslav
· 10 years ago
804d37f
Merge "Fix bugs when system apps reclaim permissions." into lmp-dev
by Jeff Sharkey
· 10 years ago
00bdf65
am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev
by Alan Viverette
· 10 years ago
91fb866
am 0a296ef3: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev
by Adam Powell
· 10 years ago
e14566e
Merge "Fix action bar title size consistency" into lmp-dev
by Alan Viverette
· 10 years ago
45acf72
am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev
by Adam Powell
· 10 years ago
b2be25d
am ff49e280: am 249e6220: am 2b5563f1: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
by Michael Wright
· 10 years ago
17f4845
Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev
by Adam Powell
· 10 years ago
d8ebbf6
am 249e6220: am 2b5563f1: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
by Michael Wright
· 10 years ago
e546540
am 2b5563f1: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
by Michael Wright
· 10 years ago
a39fa44
am ac045858: am 684e6734: am 8a03fc04: am 99b33ccb: Merge "Fix crash in PacManager" into lmp-dev
by Jason Monk
· 10 years ago
8acb6ab
am 609378ca: am 594373d1: am cf5ba66c: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
by Alan Viverette
· 10 years ago
23450c2
am 834bbcb6: am ca191524: am 1f2de4f5: am b5586e00: Fixes typo in Intent documentation
by Paul Soulos
· 10 years ago
aa45ded
am 4f3585f6: am 7d6ea755: am dec36fd9: am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
by Nancy Chen
· 10 years ago
f5d8cf7
am 99283f22: am 4868c3ab: am 4832e170: am 0ad0f097: Optimized and improved the status bar performance a lot
by Selim Cinek
· 10 years ago
299947f
am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
by Michael Wright
· 10 years ago
ce0fd76
Add new activity dumpsys command to persist all data.
by Dianne Hackborn
· 10 years ago
2deeaa3
Target only shared elements with shared element Transition
by George Mount
· 10 years ago
abd0c4d
am 684e6734: am 8a03fc04: am 99b33ccb: Merge "Fix crash in PacManager" into lmp-dev
by Jason Monk
· 10 years ago
1a5cb1ed
am 594373d1: am cf5ba66c: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
by Alan Viverette
· 10 years ago
74efac5
am ca191524: am 1f2de4f5: am b5586e00: Fixes typo in Intent documentation
by Paul Soulos
· 10 years ago
50e6543
am 7d6ea755: am dec36fd9: am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
by Nancy Chen
· 10 years ago
0ed89d7
am 4868c3ab: am 4832e170: am 0ad0f097: Optimized and improved the status bar performance a lot
by Selim Cinek
· 10 years ago
4bc92b0
Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
by Michael Wright
· 10 years ago
c6c744d
Add colorEdgeEffect to themes, default it to colorPrimary
by Adam Powell
· 10 years ago
417ea7d
am 8a03fc04: am 99b33ccb: Merge "Fix crash in PacManager" into lmp-dev
by Jason Monk
· 10 years ago
1e3d6bf
am cf5ba66c: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
by Alan Viverette
· 10 years ago
cafea23
am 1f2de4f5: am b5586e00: Fixes typo in Intent documentation
by Paul Soulos
· 10 years ago
8b726c3
am dec36fd9: am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
by Nancy Chen
· 10 years ago
326d635
am 4832e170: am 0ad0f097: Optimized and improved the status bar performance a lot
by Selim Cinek
· 10 years ago
790068a
am 99b33ccb: Merge "Fix crash in PacManager" into lmp-dev
by Jason Monk
· 10 years ago
9af2047
am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
by Alan Viverette
· 10 years ago
f9390f5
am b5586e00: Fixes typo in Intent documentation
by Paul Soulos
· 10 years ago
a82dced
am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
by Nancy Chen
· 10 years ago
8621378
am 0ad0f097: Optimized and improved the status bar performance a lot
by Selim Cinek
· 10 years ago
f6edc55
Merge "Fix crash in PacManager" into lmp-dev
by Jason Monk
· 10 years ago
840855c
Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
by Alan Viverette
· 10 years ago
628cb74
Fixes typo in Intent documentation
by Paul Soulos
· 10 years ago
0fa7511
am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
by Adam Lesinski
· 10 years ago
3fab08e
Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
by Nancy Chen
· 10 years ago
a7d1a11
am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
by Adam Lesinski
· 10 years ago
67ab8fa
am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
by Adam Lesinski
· 10 years ago
f6b46cb
Fix crash in PacManager
by Jason Monk
· 10 years ago
e2e58ef
am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
by Adam Lesinski
· 10 years ago
e83bc59
am 1fb91f51: am 158ab843: am 4f58dcf5: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev
by Chris Craik
· 10 years ago
a0fad3b
Optimized and improved the status bar performance a lot
by Selim Cinek
· 10 years ago
b6812b6
Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
by Adam Lesinski
· 10 years ago
89502b9
am 158ab843: am 4f58dcf5: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev
by Chris Craik
· 10 years ago
bfed9f3
Fix bugs when system apps reclaim permissions.
by Jeff Sharkey
· 10 years ago
159769a
am 5bf6ff68: am b7e66066: am b057639f: am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev
by Adam Powell
· 10 years ago
367e4c5
am 6fcaf93f: am 40d2705e: am a154d76e: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev
by John Reck
· 10 years ago
c29d7a5
am 16292a56: am 48443a18: am 87c6828e: am 8598377b: Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev
by Jason Monk
· 10 years ago
a316cd62
am 0c10e0fb: am d8f5590b: am b8055865: am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev
by Amit Mahajan
· 10 years ago
a706efa
am 4f58dcf5: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev
by Chris Craik
· 10 years ago
2b671ba
am b7e66066: am b057639f: am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev
by Adam Powell
· 10 years ago
f4cf77c
Add constructor for DisconnectCause that does not require a tone.
by Nancy Chen
· 10 years ago
e0707cd
am 40d2705e: am a154d76e: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev
by John Reck
· 10 years ago
6812240
am 48443a18: am 87c6828e: am 8598377b: Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev
by Jason Monk
· 10 years ago
c8fc727
am e99510a4: Merge "Hide other color filter mutability" into lmp-dev
by Chris Craik
· 10 years ago
f710c4a
am d8f5590b: am b8055865: am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev
by Amit Mahajan
· 10 years ago
10ed498
am b057639f: am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev
by Adam Powell
· 10 years ago
ddc5e5f
Merge "Hide other color filter mutability" into lmp-dev
by Chris Craik
· 10 years ago
28dc2d9
am a154d76e: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev
by John Reck
· 10 years ago
eb6f2c9
am 87c6828e: am 8598377b: Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev
by Jason Monk
· 10 years ago
c72ca78
am b8055865: am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev
by Amit Mahajan
· 10 years ago
7d507a9
am e58c9578: Merge "Make panel menu windows respect elevation" into lmp-dev
by Adam Powell
· 10 years ago
Next »