summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* Two REMOVE_PROVIDER messages caused by race condition.Guobin Zhang2013-03-271-0/+7
* am 0d47af11: Merge "Clear loaders array after they are destroyed."Jeffrey Brown2013-02-061-0/+1
|\
| * Merge "Clear loaders array after they are destroyed."Jeffrey Brown2013-02-071-0/+1
| |\
| | * Clear loaders array after they are destroyed.Roman Mazur2012-12-131-0/+1
* | | am b314f433: Merge "add reply.writeNoException() for quick response"Jeffrey Brown2013-02-061-0/+1
|\ \ \ | |/ /
| * | Merge "add reply.writeNoException() for quick response"Jeffrey Brown2013-02-071-0/+1
| |\ \
| | * | add reply.writeNoException() for quick responseSungmin Choi2012-12-201-0/+1
| | |/
* | | am 53d49f17: am 17f05497: am c2469500: Merge "Touch action bar title text: yo...Adam Powell2013-01-231-0/+15
|\ \ \
| * \ \ am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to ...Adam Powell2013-01-231-0/+15
| |\ \ \
| | * | | Touch action bar title text: you will go to space today!Adam Powell2013-01-231-0/+15
* | | | | am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch ...Scott Kennedy2013-01-142-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" in...Scott Kennedy2013-01-142-3/+3
| |\ \ \ \ | | |/ / /
| | * | | am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-devScott Kennedy2013-01-142-3/+3
| | |\ \ \
| | | * | | docs: Fix a bunch of issuesScott Kennedy2013-01-112-3/+3
* | | | | | am 782b0f71: am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugsScott Main2013-01-081-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugsScott Main2013-01-081-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am cdf5106a: docs: a few doc bugsScott Main2013-01-081-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | docs: a few doc bugsScott Main2013-01-081-1/+1
* | | | | | am 9fae2ecc: Merge "Handle nested folder case"Dianne Hackborn2013-01-071-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Handle nested folder case"Dianne Hackborn2013-01-071-1/+1
| |\ \ \ \ \
| | * | | | | Handle nested folder caseRoger Chen2013-01-031-1/+1
* | | | | | | am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation...Dianne Hackborn2013-01-071-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"Adam Powell2013-01-031-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix NullpointException problem in onMenuItemSelectedzobject2012-12-151-2/+8
| | |_|_|_|/ | |/| | | |
* | | | | | am 534de491: Merge "Make immersive mode public & imply update locking" into j...Christopher Tate2012-12-111-4/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Make immersive mode public & imply update lockingChristopher Tate2012-12-101-4/+3
* | | | | | am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"Adam Powell2012-12-101-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix EventLog string class problem in onOptionMenuSelectedzobject2012-12-101-2/+2
| | |/ / / | |/| | |
| * | | | Merge jb-mr1-dev into aosp/master - do not mergeThe Android Open Source Project2012-11-271-32/+34
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into...Daniel Sandler2012-12-061-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-devDaniel Sandler2012-12-061-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix longstanding nonsense in javadocs.Daniel Sandler2012-12-041-1/+1
* | | | | am ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font s...Dianne Hackborn2012-11-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the ...Dianne Hackborn2012-11-291-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix issue #7585876: When changing the font settings, the movie..." int...Dianne Hackborn2012-11-291-1/+1
| | |\ \ \
| | | * | | Fix issue #7585876: When changing the font settings, the movie...Dianne Hackborn2012-11-291-1/+1
* | | | | | am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for Medi...Adam Powell2012-11-291-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSe...Adam Powell2012-11-281-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" ...Adam Powell2012-11-281-1/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Clean up behavior of type arguments for MediaRouter#getSelectedRouteAdam Powell2012-11-281-1/+2
* | | | | | am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-devDianne Hackborn2012-11-292-8/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-devDianne Hackborn2012-11-282-8/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Quiet down a lot of logging." into jb-mr1.1-devDianne Hackborn2012-11-282-8/+10
| | |\ \ \ \
| | | * | | | Quiet down a lot of logging.Dianne Hackborn2012-11-272-8/+10
| | | |/ / /
* | | | | | am 6684a2ce: am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1....Daniel Sandler2012-11-271-8/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-devDaniel Sandler2012-11-271-8/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Cleanups in Notification.java." into jb-mr1.1-devDaniel Sandler2012-11-271-8/+8
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Cleanups in Notification.java.Daniel Sandler2012-11-161-8/+8