summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix issue #7255954: API Review: rename Dream to DreamServiceDianne Hackborn2012-09-2813-646/+664
* Merge "Keep callback reference from being null." into jb-mr1-devCraig Mautner2012-09-281-2/+3
|\
| * Keep callback reference from being null.Craig Mautner2012-09-281-2/+3
* | Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-m...Dianne Hackborn2012-09-2819-90/+324
|\ \
| * | Fix issue #7211769 and #7244492, thrash around on #7226656.Dianne Hackborn2012-09-2819-90/+324
* | | Merge "Fix issue #7202950: After clearing data, clear data button is still en...Dianne Hackborn2012-09-282-12/+33
|\ \ \
| * | | Fix issue #7202950: After clearing data, clear data button is still enabled.Dianne Hackborn2012-09-272-12/+33
* | | | Merge "Use updatable file for premium-sms filter" into jb-mr1-devRobert Greenwalt2012-09-286-200/+33
|\ \ \ \
| * | | | Use updatable file for premium-sms filterRobert Greenwalt2012-09-286-200/+33
* | | | | Merge "Don't try to open action bar overflow menus from bogus events" into jb...Adam Powell2012-09-281-1/+5
|\ \ \ \ \
| * | | | | Don't try to open action bar overflow menus from bogus eventsAdam Powell2012-09-281-1/+5
* | | | | | am ef6130d6: am dc3e0069: am b78c2207: Merge "updates to the brand guidelines...Scott Main2012-09-2822-126/+6822
|\ \ \ \ \ \
| * \ \ \ \ \ am dc3e0069: am b78c2207: Merge "updates to the brand guidelines, based on th...Scott Main2012-09-2822-126/+6822
| |\ \ \ \ \ \
| | * \ \ \ \ \ am b78c2207: Merge "updates to the brand guidelines, based on the partner too...Scott Main2012-09-2822-126/+6822
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "updates to the brand guidelines, based on the partner toolkit" into jb...Scott Main2012-09-2822-126/+6822
| | | |\ \ \ \ \ \
| | | | * | | | | | updates to the brand guidelines, based on the partner toolkitScott Main2012-09-2622-126/+6822
* | | | | | | | | | Merge "Track offset of center child view in Gallery for later layouts" into j...Adam Powell2012-09-281-1/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Track offset of center child view in Gallery for later layoutsAdam Powell2012-09-281-1/+17
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix a couple of rendering issues Bug #7253839" into jb-mr1-devRomain Guy2012-09-287-13/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix a couple of rendering issuesRomain Guy2012-09-287-13/+33
* | | | | | | | | | | Merge "NumberPicker should adjust min and max when displayed values are set."...Svetoslav Ganov2012-09-281-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | NumberPicker should adjust min and max when displayed values are set.Svetoslav Ganov2012-09-281-0/+8
* | | | | | | | | | | | Merge "Pass display arg to blank/unblank" into jb-mr1-devAndy McFadden2012-09-281-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Pass display arg to blank/unblankAndy McFadden2012-09-271-2/+4
* | | | | | | | | | | | | Merge "add api level 17 to javadoc filter and update version number" into jb-...Scott Main2012-09-281-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | add api level 17 to javadoc filter and update version numberScott Main2012-09-281-1/+2
* | | | | | | | | | | | | am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | DO NOT MERGE - Full (local) restore security changesChristopher Tate2012-09-282-25/+51
* | | | | | | | | | | | | | Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audi...Adam Powell2012-09-283-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | String change for video routing via MediaRouter; "HDMI" not "HDMI audio."Adam Powell2012-09-283-4/+4
* | | | | | | | | | | | | | | Merge "Add Settings.Secure.USER_SETUP_COMPLETE" into jb-mr1-devRussell Brenner2012-09-281-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add Settings.Secure.USER_SETUP_COMPLETERussell Brenner2012-09-271-0/+6
* | | | | | | | | | | | | | | | Merge "Fix occasional re-posting of ticker text." into jb-mr1-devDaniel Sandler2012-09-281-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix occasional re-posting of ticker text.Daniel Sandler2012-09-281-5/+4
* | | | | | | | | | | | | | | | | Merge "Some accessibility events not sent from touch explorer if apps misbeha...Svetoslav Ganov2012-09-285-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Some accessibility events not sent from touch explorer if apps misbehave.Svetoslav Ganov2012-09-285-0/+58
* | | | | | | | | | | | | | | | | | Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParam...Fabrice Di Meglio2012-09-282-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParamsFabrice Di Meglio2012-09-272-2/+4
* | | | | | | | | | | | | | | | | | | Merge "Other improvements for bug #6427629 Clean up layout direction APIs" in...Fabrice Di Meglio2012-09-283-83/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Other improvements for bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-273-83/+115
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Remove dock home support." into jb-mr1-devDaniel Sandler2012-09-281-85/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove dock home support.Daniel Sandler2012-09-281-85/+2
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "ScaleGestureDetector does the safety dance." into jb-mr1-devAdam Powell2012-09-281-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | ScaleGestureDetector does the safety dance.Adam Powell2012-09-281-2/+20
* | | | | | | | | | | | | | | | | | | Merge "Adding missing file in previous change (Bug 7252771)" into jb-mr1-devWinson Chung2012-09-281-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Adding missing file in previous change (Bug 7252771)Winson Chung2012-09-281-2/+3
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Add wireless display selection support to MediaRouter." into jb-mr1-devAdam Powell2012-09-287-50/+351
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add wireless display selection support to MediaRouter.Adam Powell2012-09-287-50/+351
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Missed a spot, needInput was not getting called." into jb-mr1-devCraig Mautner2012-09-281-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |