summaryrefslogtreecommitdiffstats
path: root/graphics/java
Commit message (Collapse)AuthorAgeFilesLines
* am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadocYuichi Araki2015-04-021-3/+3
|\ | | | | | | | | * commit 'e2fc3adbb4040400496aebdab80c4cac1083da27': Fix a broken link in javadoc
| * Fix a broken link in javadocYuichi Araki2015-04-021-3/+3
| | | | | | | | | | | | Bug: 19856130 Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
* | Merge "Frameworks/base: Don't allocate another identity matrix"Andreas Gampe2015-03-241-2/+1
|\ \
| * | Frameworks/base: Don't allocate another identity matrixAndreas Gampe2015-03-151-2/+1
| | | | | | | | | | | | | | | | | | | | | There is already an identity matrix in Matrix. Don't allocate another one for VectorDrawable. Change-Id: I51735f262d6680e043b0009707ec42acb2d0d1ad
* | | Merge "Frameworks/base: Make IDENTITY_MATRIX final"Andreas Gampe2015-03-171-1/+1
|\ \ \
| * | | Frameworks/base: Make IDENTITY_MATRIX finalAndreas Gampe2015-03-171-1/+1
| |/ / | | | | | | | | | | | | Bug: 19797138 Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06
* | | Frameworks/base: Fix null-pointer checkAndreas Gampe2015-03-151-1/+1
|/ / | | | | | | Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
* | am d002e027: Merge "Fix \'fuchsia\' typo."Elliott Hughes2015-02-211-2/+3
|\ \ | | | | | | | | | | | | * commit 'd002e02750b51fed3da41a2b4b222824df8d1a10': Fix 'fuchsia' typo.
| * | Fix 'fuchsia' typo.Elliott Hughes2015-02-211-2/+3
| | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=152142 Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
| * | am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using ↵ztenghui2014-10-201-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | bi-linear filter." into lmp-dev * commit '877ce2c42b5d423719246f5458cd66fa9fddb317': Make sure the bitmap from VD's cache is drawn using bi-linear filter.
| * \ \ am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-083-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '89b196958fee07475765bd3c458098464ba16f2e': Put in real "code" (aka marketing) name.
| * \ \ \ am 9f64867d: Merge "Fix theme propagation to contained android:drawable ↵Alan Viverette2014-10-029-10/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements" into lmp-dev * commit '9f64867da107b772b867876ddf979d1a3ec19192': Fix theme propagation to contained android:drawable elements
| * \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-023-10/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I97671e62de26919e391dbb2686511584c59ab990
| * \ \ \ \ \ am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-devztenghui2014-09-301-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffa16f944882f2e27109af8fe4b7272322f9cb84': Correct the documentation for VectorDrawable
| * \ \ \ \ \ \ am b805da9b: Merge "Fix drawable container tinting" into lmp-devAlan Viverette2014-09-301-13/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7': Fix drawable container tinting
| * \ \ \ \ \ \ \ am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-devChris Craik2014-09-302-1/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e910cc88387f49b119bb2f8e579849864970ac87': Implement alpha as documented for drawables
| * \ \ \ \ \ \ \ \ am 63756956: Merge "Add callback to track and thumb drawables, propagate ↵Alan Viverette2014-09-261-2/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state in ASLD" into lmp-dev * commit '637569566d2234b06e08d94acf4db1b0d3be6501': Add callback to track and thumb drawables, propagate state in ASLD
| * \ \ \ \ \ \ \ \ \ am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix ↵Alan Viverette2014-09-264-17/+47
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applyTheme in VD" into lmp-dev * commit '81e2f789029701b569d3c0deee8bc74fbebab5db': Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
| * \ \ \ \ \ \ \ \ \ \ am 21662c96: Merge "Cut ripple background alpha in half" into lmp-devAlan Viverette2014-09-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '21662c96fa9d107a60f4ce98f7179264c972b142': Cut ripple background alpha in half
| * \ \ \ \ \ \ \ \ \ \ \ am c793e67c: Merge "Fix AVD for CTS failure." into lmp-devztenghui2014-09-241-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84': Fix AVD for CTS failure.
| * \ \ \ \ \ \ \ \ \ \ \ \ am aa60232b: am 8518c090: Merge "Fix animation on the some properties" into ↵ztenghui2014-09-231-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'aa60232b96ace3ab176611c170e950a7b6db5481': Fix animation on the some properties
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 53dc022a: am e99510a4: Merge "Hide other color filter mutability" into ↵Chris Craik2014-09-193-3/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '53dc022a6c12c1b916583dc8aee92cb63c7f73f5': Hide other color filter mutability
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a96b8ea7: am 6a750aa9: Merge "Reduce overdraw after clearing ripples in ↵Alan Viverette2014-09-163-5/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RippleDrawable" into lmp-dev * commit 'a96b8ea7fe489965b7381b59169dd20fd46d334c': Reduce overdraw after clearing ripples in RippleDrawable
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 64672ef1: am 3137b288: Merge "Set cache dirty when re-create the cache ↵ztenghui2014-09-161-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap" into lmp-dev * commit '64672ef149fa48afcf7f5f4b2ed0f96386b6d368': Set cache dirty when re-create the cache bitmap
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 94474515: Merge "Prevent memory corruption from use-after-free" into ↵John Reck2015-01-231-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: bb8d7ff * commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1': Prevent memory corruption from use-after-free
| * | | | | | | | | | | | | | | | | Prevent memory corruption from use-after-freeJohn Reck2015-01-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19035637 If an app tries to call recycle() on a Bitmap that has already been finalized it will result in use-after-frees. This is bad. Avoid this by setting the pointer to 0 and checking for this Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b
* | | | | | | | | | | | | | | | | | Avoid ripple buffer creation for empty bounds automerge: b74155cAlan Viverette2015-01-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e6e216c * commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b': Avoid ripple buffer creation for empty bounds
| * | | | | | | | | | | | | | | | | Avoid ripple buffer creation for empty boundsAlan Viverette2015-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19068439 Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
* | | | | | | | | | | | | | | | | | am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a ↵Alan Viverette2015-01-152-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-hardware canvas" into lmp-mr1-dev * commit '628e646eeae6147578428632d7c25326b8b7ef59': Jump ripples to end when switching to a non-hardware canvas
| * | | | | | | | | | | | | | | | | Jump ripples to end when switching to a non-hardware canvasAlan Viverette2015-01-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we canceled the hardware animations but neglected to reset the state, which left us drawing in the pressed state. Bug: 19020524 Change-Id: I439a18126b9093cac40006361be99f8d077b95a9
* | | | | | | | | | | | | | | | | | am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on ↵Alan Viverette2014-12-122-30/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mutate, fix ColorDrawable theming" into lmp-mr1-dev * commit 'e260a358bfc945bf01d901f496b7f30784cbf920': Propagate DrawableContainer state on mutate, fix ColorDrawable theming
| * | | | | | | | | | | | | | | | | Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable ↵Alan Viverette2014-12-122-30/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | theming" into lmp-mr1-dev
| | * | | | | | | | | | | | | | | | | Propagate DrawableContainer state on mutate, fix ColorDrawable themingAlan Viverette2014-12-122-30/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18542282 BUG: 18467568 Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
* | | | | | | | | | | | | | | | | | | am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when ↵Alan Viverette2014-12-122-10/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hardware exit is pending" into lmp-mr1-dev * commit '1060d75e3abd37671b0962297f4587dd3d6e0cc8': Move ripple to end state on jump when hardware exit is pending
| * | | | | | | | | | | | | | | | | | Move ripple to end state on jump when hardware exit is pendingAlan Viverette2014-12-122-10/+37
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18734676 Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
* | | | | | | | | | | | | | | | | | am daec5943: Fix buildAlan Viverette2014-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: aaf2e19 * commit 'aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa': Fix build
| * | | | | | | | | | | | | | | | | Fix buildAlan Viverette2014-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
* | | | | | | | | | | | | | | | | | am 4e137437: Merge "Update tint filter after setting gradient drawable ↵Alan Viverette2014-12-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state" into lmp-mr1-dev automerge: c211857 * commit 'c211857af37eabb6073fa2ac402c9f7de9548822': Update tint filter after setting gradient drawable state
| * | | | | | | | | | | | | | | | | Update tint filter after setting gradient drawable stateAlan Viverette2014-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18706381 Change-Id: I7d664303c9b796243da6c55d1ea9482736aabf07
* | | | | | | | | | | | | | | | | | am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no ↵Alan Viverette2014-12-111-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant state * commit '3d517a701cb583f59ed8deefd21ab854c3890065': Avoid creating futures for drawables with no constant state
| * | | | | | | | | | | | | | | | | Avoid creating futures for drawables with no constant stateAlan Viverette2014-12-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to create futures for drawables without constant state, since we only copy on mutate and we don't need to do any work on mutate() for drawables without shared constant state. Also we would crash in that case, so avoiding the NPE is nice too. Rider: Also fixes elevations again. BUG: 18696100 Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
* | | | | | | | | | | | | | | | | | resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aospJohn Reck2014-12-097-7/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
| * | | | | | | | | | | | | | | | | Teach AssetAtlas about more drawablesJohn Reck2014-12-097-7/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18317479 Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
* | | | | | | | | | | | | | | | | | am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s ↵Alan Viverette2014-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one shot property" into lmp-mr1-dev * commit '60abe25978ab1c1e4935dcd58af9cd3a0994c12e': Fix default value of AnimationDrawable's one shot property
| * | | | | | | | | | | | | | | | | Merge "Fix default value of AnimationDrawable's one shot property" into ↵Alan Viverette2014-12-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | | | | | | | | | | Fix default value of AnimationDrawable's one shot propertyAlan Viverette2014-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18676499 Change-Id: Iaaf134b3a58a04cd99db001edc4438ee75dab878
* | | | | | | | | | | | | | | | | | | am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ↵Alan Viverette2014-12-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ViewGroup and AbsListView" into lmp-mr1-dev * commit 'e615da7eb74907c7df993009ba8137e6ddd4ac62': Fix hotspot coordinate propagation in ViewGroup and AbsListView
| * | | | | | | | | | | | | | | | | | Fix hotspot coordinate propagation in ViewGroup and AbsListViewAlan Viverette2014-12-081-0/+2
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a weird disconnect between setPressed() and hotspot propagation behavior. This makes hotspot propagation work like setPressed(). Also fixes ripple animation during drag-to-open. BUG: 18631557 BUG: 18593243 Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
* | | | | | | | | | | | | | | | | | am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup ↵ztenghui2014-12-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when mutate." into lmp-mr1-dev * commit '971fe6d66419065b96b46a20b7110ba435fa3a9a': AVD: Deep copy the animator target setup when mutate.
| * | | | | | | | | | | | | | | | | Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-devztenghui2014-12-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \