summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of ad2fa35d to masterTom Taylor2009-12-223-3/+3
|\
| * am d4a4729c: Update imports to android-commonTom Taylor2009-12-213-3/+3
| |\
| | * Update imports to android-commonTom Taylor2009-12-213-3/+3
* | | Merge change I34a427a5Android (Google) Code Review2009-12-211-5/+56
|\ \ \
| * | | Adding support for LoggingPrintStream.write(byte[]) and friends.Jesse Wilson2009-12-181-5/+56
* | | | am c4978805: merge from open-source masterJean-Baptiste Queru2009-12-211-0/+81
|\ \ \ \
| * \ \ \ merge from open-source masterJean-Baptiste Queru2009-12-211-0/+81
| |\ \ \ \
| | * | | | Time.parse3339 range checking and proper 'sec-frac' skipKenny Root2009-11-161-0/+81
| | * | | | merge from eclairJean-Baptiste Queru2009-11-15116-1985/+9027
| | |\ \ \ \
| | | * | | | eclair snapshotJean-Baptiste Queru2009-11-13116-1985/+9027
| * | | | | | am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the mon...Joe Onorato2009-12-081-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 7dfecb86: Merge change Iaa6e73a6 into eclairOmari Stephens2009-12-022-4/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am bcab01f6: Merge change Ic9f6bf94 into eclairJoe Onorato2009-11-255-0/+243
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am d782b4b6: Add keyguard permission to instrumented ImfTest package.Brett Chabot2009-11-251-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 7f7c16de: Merge changes I0c77eca9,Ibd184157,I81947f67 into eclairBen Murdoch2009-11-251-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 7f8e3409: Merge change I816428ae into eclairSwarna Kumar2009-11-242-0/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 57bda83d: Merge change I4f614c9e into eclairJoe Onorato2009-11-1940-0/+743
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layo...Guang Zhu2009-11-122-18/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am b90a187d: Merge change Ie994c0e8 into eclairjsh2009-11-061-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c3f3f9a9: Merge change Ie71d9e42 into eclairJoe Onorato2009-11-052-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bfa68abc: layout test rebase, bug fixGuang Zhu2009-11-055-33/+721
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c20fc77c: Merge change Iefd4a388 into eclairBrett Chabot2009-11-041-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e8228afb: Merge change I92cdc5ed into eclairJack Wang2009-10-301-70/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aebcaec3: Merge change I2e90d640 into eclairGuang Zhu2009-10-271-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b81df8e3: Merge change I5535bbdf into eclairBrett Chabot2009-10-2611-19/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6270d52c: Merge change Ica1d7b90 into eclairBrett Chabot2009-10-202-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 76bb9a36: Merge change I1932e8f8 into eclairBrett Chabot2009-10-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e58e642: Enable some tests that requires local http serverGuang Zhu2009-10-151-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 773fd131: Merge change I3429f77a into eclairBrett Chabot2009-10-071-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c404ed2b: Fix failing unit test; the test was using a deprecated API makin...Romain Guy2009-10-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c8dba21: Merge change I61aac7b3 into eclairTammo Spalink2009-10-071-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge change I3632fedeAndroid (Google) Code Review2009-12-181-132/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2330278Paul Westbrook2009-12-171-132/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated test GridTouchVerticalSpacingStackFromBottomTest for larger screens.Adam Powell2009-12-161-2/+6
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 5a374f94 to masterFred Quintana2009-12-151-587/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 274dc9d3: moved the hidden sync helpers out of the frameworkFred Quintana2009-12-151-587/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | moved the hidden sync helpers out of the frameworkFred Quintana2009-12-141-587/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2326468Paul Westbrook2009-12-152-386/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 15d3bb2c to masterPaul Westbrook2009-12-143-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 7762d936: Unbundling workPaul Westbrook2009-12-143-8/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | Unbundling workPaul Westbrook2009-12-143-8/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of f6bb01b0 to masterDan Egnor2009-12-112-75/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am b7f0367c: Eliminate CrashData and friends.Dan Egnor2009-12-112-75/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | Eliminate CrashData and friends.Dan Egnor2009-12-112-75/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2Wink Saville2009-12-112-119/+1392
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 8fb0faf3: Merge change I0a56959e into eclair-mr2Wink Saville2009-12-102-119/+1392
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge change I0a56959e into eclair-mr2Android (Google) Code Review2009-12-102-119/+1392
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Implement a HierarchicalStateMachineWink Saville2009-12-082-119/+1392
* | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of da9691e9 to masterJean-Baptiste Queru2009-12-104-0/+310
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 326d808b: Added View#dispatchViewVisibilityChanged and View#onDispatchVisi...Adam Powell2009-12-104-0/+310
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
generated by cgit v1.1 at 2024-07-02 14:54:32 +0000