summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Don't crash in StorageMeasurement if volume isn't mounted" into mnc-devTony Mantler2015-05-051-3/+9
|\
| * Don't crash in StorageMeasurement if volume isn't mountedTony Mantler2015-05-041-3/+9
* | Merge "Sanity checks in JNI code for closure creation" into mnc-devYang Ni2015-05-052-46/+180
|\ \
| * | Sanity checks in JNI code for closure creationYang Ni2015-05-042-46/+180
* | | Merge "Fix NPE in Html.inParagraph()" into mnc-devRaph Levien2015-05-051-1/+1
|\ \ \
| * | | Fix NPE in Html.inParagraph()Raph Levien2015-05-051-1/+1
| | |/ | |/|
* | | Merge "Fixing docs." into mnc-devJulia Reynolds2015-05-052-5/+5
|\ \ \
| * | | Fixing docs.Julia Reynolds2015-05-052-5/+5
* | | | Merge "Add hidden methods to set/get default dialer across users" into mnc-devYorke Lee2015-05-051-10/+41
|\ \ \ \
| * | | | Add hidden methods to set/get default dialer across usersYorke Lee2015-05-041-10/+41
* | | | | Merge "Add some basic DA unit tests" into mnc-devJohn Reck2015-05-052-0/+82
|\ \ \ \ \
| * | | | | Add some basic DA unit testsJohn Reck2015-05-052-0/+82
* | | | | | Settings UI for SIM access profile (2/2)Casper Bonde2015-05-053-5/+244
| |_|/ / / |/| | | |
* | | | | Merge "Add API for obtaining changing configurations bitmask from Theme" into...Alan Viverette2015-05-058-3/+63
|\ \ \ \ \
| * | | | | Add API for obtaining changing configurations bitmask from ThemeAlan Viverette2015-05-058-3/+63
| | |_|/ / | |/| | |
* | | | | Merge "AudioRecord JNI: use default UID / PID" into mnc-devJean-Michel Trivi2015-05-051-0/+1
|\ \ \ \ \
| * | | | | AudioRecord JNI: use default UID / PIDJean-Michel Trivi2015-05-051-0/+1
* | | | | | Merge "Call Activity#onAttachFragment()" into mnc-devTodd Kennedy2015-05-056-13/+25
|\ \ \ \ \ \
| * | | | | | Call Activity#onAttachFragment()Todd Kennedy2015-05-046-13/+25
* | | | | | | Merge "Call profile changed in cases were focused activity is nulled." into m...Kenny Guy2015-05-051-2/+20
|\ \ \ \ \ \ \
| * | | | | | | Call profile changed in cases were focused activity is nulled.Kenny Guy2015-04-301-2/+20
* | | | | | | | Merge "Permission UI - legacy apps support" into mnc-devSvet Ganov2015-05-058-50/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Permission UI - legacy apps supportSvet Ganov2015-05-058-50/+45
* | | | | | | | | Merge "Attempt to solve the double-GC problem" into mnc-devJohn Reck2015-05-058-384/+701
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Attempt to solve the double-GC problemJohn Reck2015-05-048-384/+701
* | | | | | | | | | Merge "Zen: Remove calendar rule attendance attribute." into mnc-devJohn Spurlock2015-05-052-41/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Zen: Remove calendar rule attendance attribute.John Spurlock2015-05-052-41/+10
* | | | | | | | | | | Remove dead code from IMMS.Seigo Nonaka2015-05-051-20/+7
* | | | | | | | | | | am 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and header/fo...Dirk Dougherty2015-05-05117-1226/+1470
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am ecfed34d: Merge "Doc change: merge landing page and header/footer designs....Dirk Dougherty2015-05-05117-1226/+1470
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge "Doc change: merge landing page and header/footer designs." into mnc-pr...Dirk Dougherty2015-05-05117-1226/+1470
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Doc change: merge landing page and header/footer designs.Dirk Dougherty2015-05-03117-1226/+1470
* | | | | | | | | | | | | | am 2f626153: am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclip...Rich Slogar2015-05-051-9/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate pr...Rich Slogar2015-05-051-9/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into...Rich Slogar2015-05-041-9/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docsRich Slogar2015-05-041-9/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Update Eclipse migrate procedure" into lmp-docsRich Slogar2015-05-041-9/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | docs: Update Eclipse migrate procedureRich Slogar2015-04-281-9/+23
* | | | | | | | | | | | | | | | | am 168bbcef: am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to...Andrew Solovay2015-05-056-1/+402
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh trai...Andrew Solovay2015-05-056-1/+402
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." ...Andrew Solovay2015-05-046-1/+402
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docsAndrew Solovay2015-05-046-1/+402
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | Merge "Docs: New swipe-to-refresh training guide." into lmp-docsAndrew Solovay2015-05-046-1/+402
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Docs: New swipe-to-refresh training guide.Joe Malin2015-04-176-1/+402
* | | | | | | | | | | | | | | | | | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-0565-386/+750
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'b6f59f4' into master_mergePrerepa Viswanadham2015-05-011-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "IMS-VT: Enable video calls" into m-wireless-devEtan Cohen2015-04-291-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | IMS-VT: Enable video callsRekha Kumar2015-04-071-0/+5
| * | | | | | | | | | | | | | | | | | | | Merge commit 'f6db0ce' into master_mergePrerepa Viswanadham2015-05-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | DO NOT MERGE - Make sure to return network type after conversionSooraj Sasindran2015-04-281-1/+1