summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge "Manual fix for some Norwegian format strings."Elliott Hughes2013-01-141-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Manual fix for some Norwegian format strings.Elliott Hughes2013-01-141-5/+5
|/ / / / / / /
* | | | | | | Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."Elliott Hughes2013-01-1476-174/+11
|\ \ \ \ \ \ \
| * | | | | | | Switch over to getting 12-/24-hour time formats from CLDR via icu4c.Elliott Hughes2013-01-1476-174/+11
* | | | | | | | Merge "Fix the spelling of "retrieves""Christopher Tate2013-01-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the spelling of "retrieves"Scott Kennedy2013-01-111-1/+1
|/ / / / / / / /
* | | | | | | | Merge "TIME_TICK was not occurred for one hour"Christopher Tate2013-01-101-6/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | TIME_TICK was not occurred for one hourSungmin Choi2013-01-101-6/+2
|/ / / / / / /
* | | | | | | Merge "Handle nested folder case"Dianne Hackborn2013-01-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Handle nested folder caseRoger Chen2013-01-031-1/+1
| |/ / / / / /
* | | | | | | Merge "Setting the default value for dock audio"Dianne Hackborn2013-01-072-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Setting the default value for dock audioDmytro Dubovyk2012-12-192-0/+4
* | | | | | | | Merge "Correcting typo in doc of MEDIA_XXX intents"Dianne Hackborn2013-01-071-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Correcting typo in doc of MEDIA_XXX intentssuyi Yuan2013-01-041-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."Dianne Hackborn2013-01-071-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Hopefully fix PendingIntent.getActivities() documentation wtf.Tim Hutt2012-12-101-2/+2
* | | | | | | | | Merge "Use most specific attributes for distinguished name display"Brian Carlstrom2013-01-042-18/+92
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use most specific attributes for distinguished name displayBrian Carlstrom2013-01-042-18/+92
|/ / / / / / / /
* | | | | | | | Merge "Revert "fix potential memory leak""Elliott Hughes2013-01-031-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "fix potential memory leak"Elliott Hughes2013-01-031-3/+0
* | | | | | | | | Merge "fix potential memory leak"Elliott Hughes2013-01-031-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | fix potential memory leakSungmin Choi2013-01-041-0/+3
* | | | | | | | | Merge "Fix NullpointException problem in onMenuItemSelected"Adam Powell2013-01-031-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix NullpointException problem in onMenuItemSelectedzobject2012-12-151-2/+8
* | | | | | | | | | Merge "frameworks/base: Support for LTE network modes"Wink Saville2013-01-032-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | frameworks/base: Support for LTE network modesUma Maheswari Ramalingam2013-01-022-1/+3
* | | | | | | | | | Merge "Fix logging typos in GpsLocationProvider"Victoria Lease2013-01-021-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix logging typos in GpsLocationProviderMagnus Eriksson2012-12-211-3/+3
* | | | | | | | | | Merge "Fixed typo in Recreating an Activity documentation"Amith Yamasani2013-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed typo in Recreating an Activity documentationGulshan Singh2012-12-211-1/+1
* | | | | | | | | | | Merge "StringBlock_nativeCreate: Possible Leak"Elliott Hughes2012-12-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | StringBlock_nativeCreate: Possible LeakYou Kim2012-12-211-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle errors from AudioEffect::queryNumberEffectsPeter Karlsson2012-11-161-2/+5
* | | | | | | | | | | Merge "Set "isdrm" info in Mediastore"James Dong2012-12-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set "isdrm" info in MediastoreErik Almqvist2012-12-061-1/+2
* | | | | | | | | | | | Merge "NsdService: Clear client info after resolution request is serviced."Irfan Sheriff2012-12-201-123/+129
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | NsdService: Clear client info after resolution request is serviced.Vairavan Srinivasan2012-08-231-123/+129
* | | | | | | | | | | | Merge "Possible leak in android_emoji_EmojiFactory_newInstance"Victoria Lease2012-12-201-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Possible leak in android_emoji_EmojiFactory_newInstanceYou Kim2012-12-121-9/+5
* | | | | | | | | | | | Merge "Fix typo"Andrew Hsieh2012-12-193-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix typoAndrew Hsieh2012-12-193-11/+11
* | | | | | | | | | | | | Merge "Leak in ToneGenerator_native_setup"Glenn Kasten2012-12-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Leak in ToneGenerator_native_setupYou Kim2012-12-071-0/+1
* | | | | | | | | | | | | | Merge "Update the JNI spec link, and remove a dead link."Elliott Hughes2012-12-182-723/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Update the JNI spec link, and remove a dead link.Elliott Hughes2012-12-182-723/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Return error upon attempt to use non-existent APN"Robert Greenwalt2012-12-181-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Return error upon attempt to use non-existent APNMikael Hedegren2012-12-181-2/+5
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Memory leak due to bad destroy sequence"Adam Powell2012-12-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Memory leak due to bad destroy sequenceJean-Christophe PINCE2012-12-141-1/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |