summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'LA.BF64.1.2.2_rb4.1' of git://codeaurora.org/platform/external/...HEADreplicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-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.0Steve Kondik2015-10-120-0/+0
|\
| * am 4fe49766: Merge "Delete some pointless and invalid code."Brian Carlstrom2014-01-280-0/+0
| |\
| | * Merge "Delete some pointless and invalid code."Brian Carlstrom2014-01-281-90/+0
| | |\
| | | * Delete some pointless and invalid code.Narayan Kamath2014-01-281-90/+0
| | |/
| * | Delete some pointless and invalid code.Narayan Kamath2013-10-241-90/+0
| |/
* | 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.1Jerome Pilliet2013-01-091-90/+0
|/
* Merge "host modules don't need LOCAL_MODULE_TAGS"Joe Onorato2012-08-171-1/+0
|\
| * host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-07-201-1/+0
|/
* Update AndroidMock with version that supports SDK 9.jellybean-stablejellybeanLuis Sigal2011-03-106-12/+33
* Add Notice and Module licenseLuis Sigal2011-03-012-0/+190
* Add android-mock to externalLuis Sigal2011-02-2448-0/+7800
* Initial empty repositoryAndroid (Google) Code Review2011-02-220-0/+0