- 1022888 resolved conflicts for merge of 203c8171 to master by John Reck · 12 years ago
- 203c817 am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev by Derek Sollenberger · 12 years ago
- f29d5a5 Update AndroidPixelRef to prevent VM from cleaning up memory prematurely. by Derek Sollenberger · 12 years ago
- ea0db58 am 42b678b3: am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 42b678b am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 5ed8f27 Update drawable container constant state following clone by Alan Viverette · 12 years ago
- 39319d1 am e5684843: am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev by Alan Viverette · 12 years ago
- e568484 am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 5838386 am af3efb4a: am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev by John Reck · 12 years ago
- 270ca58 am c9b68e11: am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev by Alan Viverette · 12 years ago
- b65c4a6 am 15913c80: am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev by Alan Viverette · 12 years ago
- af3efb4 am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev by John Reck · 12 years ago
- c9b68e1 am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 15913c8 am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 8dcd533 Ensure calling mutate() on DrawableContainer creates a new state by Alan Viverette · 12 years ago
- fb6121e Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev by John Reck · 12 years ago
- cf84ab5 Revert "Ensure calling mutate() on DrawableContainer creates a new state" by John Reck · 12 years ago
- d30f6fb Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev by Alan Viverette · 12 years ago
- d7dab34 Ensure calling mutate() on DrawableContainer creates a new state by Alan Viverette · 12 years ago
- 90102e1 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev by Chris Craik · 12 years ago
- 6bcf223 Merge "Revert "Add a way to override Xfermode"" by Chris Craik · 12 years ago
- 29dc496 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev by Chris Craik · 12 years ago
- da3198a Revert "Add a way to override Xfermode" by Chris Craik · 12 years ago
- 69e6501 Revert "Add a way to override Xfermode DO NOT MERGE" by Chris Craik · 12 years ago
- 5287c18 am 3458abd6: am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev automerge: e9dbfe5 by ztenghui · 12 years ago
- 735b75c Cannot set Pivot X,Y values from setPivotX, setPivotY API by jungheang.lee · 12 years ago
- 08dc405 am 0d6512a8: am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev automerge: 5b41215 by Chris Craik · 12 years ago
- 3458abd am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev by ztenghui · 12 years ago
- 0d6512a am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev by Chris Craik · 12 years ago
- 002bc81 Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev by ztenghui · 12 years ago
- 5b84eac ASLD: ASLD's XML reversible flag can turn off the reverse behavior now. by ztenghui · 12 years ago
- 93ef963 Merge "Improve ColorMatrix docs" into lmp-mr1-dev by Chris Craik · 12 years ago
- db7cc60 Improve ColorMatrix docs by Chris Craik · 12 years ago
- 0a39f8f am 7010d0b6: am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev automerge: 58fa003 by Raph Levien · 12 years ago
- 7010d0b am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev by Raph Levien · 12 years ago
- 505ffe3 Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev by Raph Levien · 12 years ago
- a208f54 am 5961f6b7: am a9566f90: am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev by Alan Viverette · 12 years ago
- a76634b am bbac83fc: am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev by Chris Craik · 12 years ago
- 5961f6b am a9566f90: am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 0c24237 Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev by Alan Viverette · 12 years ago
- bbac83f am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev by Chris Craik · 12 years ago
- d03963c Set current degrees when updating RotateDrawable from typed array by Alan Viverette · 12 years ago
- 6b3bf0c Merge "Add offset method to Outline" into lmp-mr1-dev by Chris Craik · 12 years ago
- 95e5a82 Merge "Add a way to override Xfermode" by Rob Tsuk · 12 years ago
- e8a39f5 am b71be9c3: am 9750c696: am 075b2b4f: Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev by Chris Craik · 12 years ago
- b71be9c3 am 9750c696: am 075b2b4f: Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev by Chris Craik · 12 years ago
- 0e12fa12 Add offset method to Outline by Chris Craik · 12 years ago
- 075b2b4 Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev by Chris Craik · 12 years ago
- 8aa0bbf am 469e72ff: am 5f876974: am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 74a2d76 am c3e29108: am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 by ztenghui · 12 years ago
- 710f713 am 84ed482f: am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba by Alan Viverette · 12 years ago
- 469e72f am 5f876974: am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev by Alan Viverette · 12 years ago
- c495e61 Add a way to override Xfermode by Rob Tsuk · 12 years ago
- 6552afa am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev by Rob Tsuk · 12 years ago
- c3e2910 am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 by ztenghui · 12 years ago
- 84ed482 am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba by Alan Viverette · 12 years ago
- d82f8a9 Check bounds on CharSequence drawText methods by Raph Levien · 12 years ago
- 667ec63 Merge "Don't propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 41a8043 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev by Rob Tsuk · 12 years ago
- ffcb5e2 Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev by ztenghui · 12 years ago
- 4678dcc Add a way to override Xfermode DO NOT MERGE by Rob Tsuk · 12 years ago
- f9afb46 Fix default attributes in ScaleDrawable by Alan Viverette · 12 years ago
- 9355b66 am fca5f35e: Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev automerge: b724314 automerge: 0bc1eee by Alan Viverette · 12 years ago
- fca5f35 Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev automerge: b724314 by Alan Viverette · 12 years ago
- 2d91f63 Don't propagate AnimatedStateListDrawable state change to super() by Alan Viverette · 12 years ago
- b724314 Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev by Alan Viverette · 12 years ago
- f37a364 Add details and performance warnings to save flag docs by Chris Craik · 12 years ago
- 1a40fac AVD: Requires all animator has stopped before start again. by ztenghui · 12 years ago
- cc3c573 Reduce number of saveLayer calls in RippleDrawable by Alan Viverette · 12 years ago
- 75d1cbd am e37c761e: am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev by Alan Viverette · 12 years ago
- e37c761 am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev by Alan Viverette · 12 years ago
- d6570d1 Support theme attributes in StateListDrawable <item> element by Alan Viverette · 12 years ago
- 2fe0855 am 9fb51ad8: am a04a5e82: am 6e85abd4: Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 9fb51ad am a04a5e82: am 6e85abd4: Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev by Alan Viverette · 12 years ago
- b4f8a98 Default gradient radius to %p when no intrinsic width or height set by Alan Viverette · 12 years ago
- e73c6d9 am 28d51a39: am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev automerge: 4f5b8a6 by Svet Ganov · 12 years ago
- 28d51a3 am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev by Svet Ganov · 12 years ago
- fce84f0 Crash apps that print malformed or password protected PDFs. by Svet Ganov · 12 years ago
- a3b6fc4 am 2a6749ad: am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev automerge: 160021d by Svetoslav · 12 years ago
- 2a6749a am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev by Svetoslav · 12 years ago
- 93134ce Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev by Svetoslav · 12 years ago
- bec22be Save to a PDF file should look like print preview. by Svetoslav · 12 years ago
- 613d434 am 71c27899: am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 71c2789 am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 2929579 am 370403db: am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 370403d am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 7f4a63d Ensure we don't pass null values in to Theme.resolveAttributes by Alan Viverette · 12 years ago
- 425b1dc Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev by Alan Viverette · 12 years ago
- d21fd9d Add theme and config change support to more Drawable types by Alan Viverette · 12 years ago
- c6dac7e am 51547e75: am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72 by Alan Viverette · 12 years ago
- 51547e7 am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72 by Alan Viverette · 12 years ago
- 969ca91 Clean up GradientDrawable styled attributes, fix useLevelForShape by Alan Viverette · 12 years ago
- ba4814a am ab43570f: am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev by Yigit Boyar · 12 years ago
- ab43570 am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev by Yigit Boyar · 12 years ago
- d422dc3 Added a generic configuration and theme based cache by Yigit Boyar · 12 years ago
- 425cc66 Merge "Refactor HWUI to better handle Canvas DrawFilters." by Derek Sollenberger · 12 years ago
- ac68e99 am ef2fef17: am ed89e452: am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev by Alan Viverette · 12 years ago
- ef2fef1 am ed89e452: am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 7fd807d am 2c861c78: am 0a8a3eab: am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev by Alan Viverette · 12 years ago
- 2c861c7 am 0a8a3eab: am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev by Alan Viverette · 12 years ago