| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'LA.BF64.1.2.2_rb4.1' of ↵HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0 | Steve Kondik | 2015-10-12 | 0 | -0/+0 |
| |\ | | | | | | | git://codeaurora.org/platform/external/android-mock into caf-merge | ||||
| | * | am 4fe49766: Merge "Delete some pointless and invalid code." | Brian Carlstrom | 2014-01-28 | 0 | -0/+0 |
| | |\ | | | | | | | | | | | | | * commit '4fe497660c2e939300dc5b743d662aef458b1726': Delete some pointless and invalid code. | ||||
| | | * | Merge "Delete some pointless and invalid code." | Brian Carlstrom | 2014-01-28 | 1 | -90/+0 |
| | | |\ | |||||
| | | | * | Delete some pointless and invalid code. | Narayan Kamath | 2014-01-28 | 1 | -90/+0 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These "convenience" methods are invalid because they all have the same erasure. They do not compile with java-7-openjdk. android-mock is used only by QuicksearchBoxGoogle (which I'm going to remove soon) and no new projects should use it. (They should use mockito instead) bug: 8992787 (cherry picked from commit 41cc67f9282657bfcf6ed2b565ee42ed7a40ee6c) Change-Id: I31dd6741037a73ff005d90b3a1e43eafa3e93558 | ||||
| | * / | Delete some pointless and invalid code. | Narayan Kamath | 2013-10-24 | 1 | -90/+0 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | These "convenience" methods are invalid because they all have the same erasure. They do not compile with java-7-openjdk. android-mock is used only by QuicksearchBoxGoogle (which I'm going to remove soon) and no new projects should use it. (They should use mockito instead) bug: 8992787 Change-Id: Ia5be952228c9f656188d858e9db9b4f6a93f19ef | ||||
| * / | Some changes added to compile and run with Java 6 and Java 7.cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56cm-10.2.1cm-10.2.0cm-10.2-M1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1staging/cm-12.1staging/cm-12.0-cafstable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Istable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0stable/cm-10.2shipping/cm-11.0mr1.1-stagingcm-12.1cm-12.0cm-11.0cm-10.2cm-10.1 | Jerome Pilliet | 2013-01-09 | 1 | -90/+0 |
| |/ | | | | | | - overload problems Change-Id: I15a367dbce3a52557c8236fe0888f0174dfff024 | ||||
| * | Merge "host modules don't need LOCAL_MODULE_TAGS" | Joe Onorato | 2012-08-16 | 1 | -1/+0 |
| |\ | |||||
| | * | host modules don't need LOCAL_MODULE_TAGS | Joe Onorato | 2012-07-20 | 1 | -1/+0 |
| |/ | | | | Change-Id: I599873d9ee71d3d8953b84547b46231d289102f2 | ||||
| * | Update AndroidMock with version that supports SDK 9.jellybean-stablejellybean | Luis Sigal | 2011-03-10 | 6 | -12/+33 |
| | | | | | | This is a simple export from the upstream repo. Change-Id: I3b9d49116adb0089352357189c08a7b8f359814d | ||||
| * | Add Notice and Module license | Luis Sigal | 2011-03-01 | 2 | -0/+190 |
| | | | | | | | These are required for the displaying of the notice. Change-Id: Id8ed12f61189cfe1479a34ae27cb6645fcba7406 | ||||
| * | Add android-mock to external | Luis Sigal | 2011-02-24 | 48 | -0/+7800 |
| | | | | | | | | Android mock is used by QuickSearchBox to mock classes instead of creating tons of interfaces. Change-Id: Ib53ca3a6c5e8e27f42b66cc9e39bbf0d55ed2170 | ||||
| * | Initial empty repository | Android (Google) Code Review | 2011-02-22 | 0 | -0/+0 |
 |
index : android_external_android-mock | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |