summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
Commit message (Expand)AuthorAgeFilesLines
* am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"Andreas Gampe2015-03-051-0/+20
|\
| * Frameworks/base: Add removeAll for ArraySetAndreas Gampe2015-03-041-0/+20
* | Merge "Remove usages of FloatMath" automerge: a8e8cdbNeil Fuller2015-02-121-1/+1
|\ \ | |/
| * Remove usages of FloatMathNeil Fuller2015-02-121-1/+1
* | am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-devAdam Powell2015-02-121-0/+7
|\ \
| * \ Merge "Add DENSITY_280" into lmp-mr1-devAdam Powell2015-02-121-0/+7
| |\ \
| | * | Add DENSITY_280Adam Powell2015-02-111-0/+7
* | | | am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-devAdam Lesinski2015-02-051-1/+4
|\ \ \ \ | |/ / /
| * | | Make ArrayMap.EMPTY immutableAdam Lesinski2015-02-051-1/+4
| |/ /
* | | am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is ...Lorenzo Colitti2015-01-261-0/+20
|\ \ \ | |/ /
| * | Only try to fetch time from NTP if there is a network connection.Lorenzo Colitti2015-01-261-0/+20
* | | Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1Jeff Sharkey2015-01-081-1/+2
|\ \ \ | | |/ | |/|
| * | check ntpserver as empty string instead of nullYoung-Ho Cha2015-01-081-1/+2
| * | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-201-12/+31
| |\ \
| * \ \ am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implement...Elliott Hughes2014-10-181-7/+4
| |\ \ \
| * \ \ \ am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-161-4/+7
| |\ \ \ \
| * \ \ \ \ am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-devvandwalle2014-10-031-4/+8
| |\ \ \ \ \
| * \ \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-021-2/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in agg...Dianne Hackborn2014-12-082-0/+12
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix issue #17323751: Additional items in aggregated battery statsDianne Hackborn2014-12-052-0/+12
* | | | | | | | am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path...ztenghui2014-11-141-6/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix the starting pen's position when a path close.ztenghui2014-11-131-6/+19
* | | | | | | | am be36ebc2: Merge "Add convenience method for getting the complex unit type"...Christopher Lane2014-10-311-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add convenience method for getting the complex unit typeChristopher Lane2014-10-311-0/+12
* | | | | | | | am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null va...Alan Viverette2014-10-311-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-0/+11
* | | | | | | | am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-...Jeff Sharkey2014-10-271-1/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-devJeff Sharkey2014-10-271-1/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Reduce PackageManager RAM usage: ArrayMap/Set.Jeff Sharkey2014-10-241-1/+8
* | | | | | | | | Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1...Alan Viverette2014-10-241-0/+162
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1...Alan Viverette2014-10-241-0/+162
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add support for Explore by Touch to RadialTimePickerViewAlan Viverette2014-10-241-0/+162
* | | | | | | | | resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-241-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Deprecating FloatMath and TimeNeil Fuller2014-10-231-0/+3
| |/ / / / / / /
* | | | | | | | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-201-12/+31
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Replacing FloatMath native implementation with calls to MathNick Kralevich2014-10-201-12/+31
| | |_|/ / / / | |/| | | | |
* | | | | | | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implement...Elliott Hughes2014-10-181-7/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge "Revert "Replacing FloatMath native implementation with calls to Math""Elliott Hughes2014-10-181-7/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Revert "Replacing FloatMath native implementation with calls to Math"Elliott Hughes2014-10-181-7/+4
* | | | | | | am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-161-4/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Replacing FloatMath native implementation with calls to Math"Neil Fuller2014-10-161-4/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | |
| | * | | | Replacing FloatMath native implementation with calls to MathNeil Fuller2014-10-151-4/+7
* | | | | | am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data i...ztenghui2014-10-101-5/+21
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Support negative value in exponential data in the pathData.ztenghui2014-10-101-5/+21
* | | | | | am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data ...ztenghui2014-10-101-7/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Support dot separation as the svg path data did.ztenghui2014-10-081-7/+17
| | |_|_|/ | |/| | |
* | | | | am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond ti...vandwalle2014-10-041-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | add millisecond timestamp to locallogvandwalle2014-10-031-4/+8
| | |_|/ | |/| |
* | | | am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue...Dianne Hackborn2014-10-021-0/+20
|\ \ \ \ | |/ / /
| * | | More work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-10-011-0/+20
generated by cgit v1.1 at 2024-09-10 21:31:20 +0000