summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Telephony: Dynamically instantiate IccCardAlex Yakavenka2012-08-081-0/+1
* Merge "Telephony: Move AdnRecord.aidl into opt/telephony"Wink Saville2012-08-042-20/+1
|\
| * Telephony: Move AdnRecord.aidl into opt/telephonyAlex Yakavenka2012-08-032-20/+1
* | Merge "show 3G icon for CDMA/1xRTT"Wink Saville2012-08-041-11/+19
|\ \
| * | show 3G icon for CDMA/1xRTTMadan Ankapura2012-08-021-11/+19
|/ /
* | Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"Brian Carlstrom2012-08-012-22/+46
|\ \
| * | Change KeyStore to use Modified UTF-8 to match NativeCryptoBrian Carlstrom2012-08-012-22/+46
|/ /
* | Merge "Improve test key names to reproduce public issue"Brian Carlstrom2012-08-011-9/+11
|\ \
| * | Improve test key names to reproduce public issueBrian Carlstrom2012-07-271-9/+11
* | | Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"Robert Greenwalt2012-08-011-0/+3
|\ \ \
| * | | Telephony: Add HSPAP to getTcpBufferSizesPropNameNaveen Kalla2012-07-261-0/+3
* | | | Merge " Fix preload classname for phone policy."Adam Powell2012-07-301-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix preload classname for phone policy.SangWook Han2012-06-071-1/+1
* | | | Merge "Corrected typo when checking InputStream methods"Romain Guy2012-07-271-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Corrected typo when checking InputStream methodsEdward Savage-Jones2012-07-271-1/+1
| | |/ | |/|
* | | Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"Nick Kralevich2012-07-192-12/+12
|\ \ \
| * | | s/LOG/ALOG/ in HAVE_SELINUX blocksJoshua Brindle2012-07-102-12/+12
* | | | Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony"Jake Hamby2012-07-191-466/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephonyNaveen Kalla2012-07-181-466/+0
|/ / /
* | | Create telephony-common and mms-common - DO NOT MERGEWink Saville2012-07-17300-98796/+866
* | | Merge "Don't talk about Froyo as if it's still in the future."Elliott Hughes2012-07-161-8/+11
|\ \ \
| * | | Don't talk about Froyo as if it's still in the future.Elliott Hughes2012-07-161-8/+11
| |/ /
* | | Merge "Fix wrong condition."Romain Guy2012-07-161-1/+1
|\ \ \ | |/ / |/| |
| * | Fix wrong condition.SeongJae Park2012-07-141-1/+1
|/ /
* | am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log."Romain Guy2012-07-061-2/+2
|\ \
| * \ Merge "Pass SearchView suggestion cursor exception to Log."Romain Guy2012-07-061-2/+2
| |\ \
| | * | Pass SearchView suggestion cursor exception to Log.Jake Wharton2012-07-061-2/+2
| |/ /
* | | am 15796e52: Merge "docs: add largeHeap attribute to app manifest doc externa...Scott Main2012-07-031-0/+14
|\ \ \
| * \ \ Merge "docs: add largeHeap attribute to app manifest doc external issue 33967...Scott Main2012-07-031-0/+14
| |\ \ \
| | * | | docs: add largeHeap attribute to app manifest docScott Main2012-07-031-0/+14
* | | | | am e469e74f: docs: new sitemap text fileScott Main2012-07-032-4187/+5589
|\ \ \ \ \ | |/ / / /
| * | | | docs: new sitemap text fileScott Main2012-07-032-4187/+5589
| |/ / /
* | | | am fd516987: docs: misc bugs from external trackerScott Main2012-07-037-715/+19
|\ \ \ \ | |/ / /
| * | | docs: misc bugs from external trackerScott Main2012-07-037-715/+19
* | | | am 099fd80f: docs: add throws notice for isPlaying per external issue 33610Scott Main2012-07-031-0/+2
|\ \ \ \ | |/ / /
| * | | docs: add throws notice for isPlayingScott Main2012-07-031-0/+2
* | | | am 4c633ea6: Merge "DOC CHANGE: AOSP33968 Typo" into jb-devJoe Malin2012-07-031-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "DOC CHANGE: AOSP33968 Typo" into jb-devJoe Malin2012-07-031-2/+2
| |\ \ \
| | * | | DOC CHANGE: AOSP33968 TypoJoe Malin2012-07-031-2/+2
* | | | | am 8d5efa6a: Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-devJoe Malin2012-07-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-devJoe Malin2012-07-031-1/+1
| |\ \ \ \
| | * | | | DOC CHANGE: AOSP 33831 - TypoJoe Malin2012-07-031-1/+1
| | |/ / /
* | | | | am 8ab2dfb2: Merge "docs: fix urls on homepage for offline docs" into jb-devScott Main2012-07-031-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "docs: fix urls on homepage for offline docs" into jb-devScott Main2012-07-031-5/+5
| |\ \ \ \
| | * | | | docs: fix urls on homepage for offline docsScott Main2012-07-031-5/+5
| | |/ / /
* | | | | Reconcile with jb-releaseThe Android Open Source Project2012-07-030-0/+0
|\ \ \ \ \
| * \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-07-030-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am 5d0c689b: Merge "Logs to track bug 6765842." into jb-devDaniel Sandler2012-07-031-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Logs to track bug 6765842." into jb-devDaniel Sandler2012-07-031-1/+6
| |\ \ \ \ \
| | * | | | | Logs to track bug 6765842.Daniel Sandler2012-07-031-1/+6