summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix JNI method signature.Jeff Sharkey2012-09-261-1/+1
* Merge "Fix sync problems when setting up a new user and account" into jb-mr1-devAmith Yamasani2012-09-261-2/+11
|\
| * Fix sync problems when setting up a new user and accountAmith Yamasani2012-09-261-2/+11
* | Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()...Philip Milne2012-09-269-38/+31
|\ \
| * | Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()Philip Milne2012-09-269-38/+31
* | | Merge "Make DreamManagerService more robust." into jb-mr1-devJeff Brown2012-09-2613-577/+615
|\ \ \
| * | | Make DreamManagerService more robust.Jeff Brown2012-09-2613-577/+615
* | | | Merge "ScaleGestureDetector bugfixes" into jb-mr1-devAdam Powell2012-09-261-2/+2
|\ \ \ \
| * | | | ScaleGestureDetector bugfixesAdam Powell2012-09-261-2/+2
| | |_|/ | |/| |
* | | | Merge "Move DreamManagerService to its own package." into jb-mr1-devJeff Brown2012-09-263-5/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Move DreamManagerService to its own package.Jeff Brown2012-09-263-5/+3
* | | | Merge "fix build break" into jb-mr1-devTim Murray2012-09-261-0/+24
|\ \ \ \
| * | | | fix build breakTim Murray2012-09-261-0/+24
* | | | | Merge "fix blend intrinsics, add tests" into jb-mr1-devTim Murray2012-09-265-12/+220
|\ \ \ \ \ | |/ / / /
| * | | | fix blend intrinsics, add testsTim Murray2012-09-265-12/+220
* | | | | Merge "Make gradients beautiful again Bug #7239634" into jb-mr1-devRomain Guy2012-09-263-10/+19
|\ \ \ \ \
| * | | | | Make gradients beautiful againRomain Guy2012-09-263-10/+19
* | | | | | Merge "Reverting public setSoWriteTimeout" into jb-mr1-devBrian Carlstrom2012-09-263-55/+20
|\ \ \ \ \ \
| * | | | | | Reverting public setSoWriteTimeoutBrian Carlstrom2012-09-263-55/+20
* | | | | | | Merge "Fix issue #7238170: Edit picture option is not available for the secon...Dianne Hackborn2012-09-261-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix issue #7238170: Edit picture option is not available for the secondary user.Dianne Hackborn2012-09-261-2/+3
* | | | | | | | Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-devAdam Powell2012-09-261-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix adjustViewBounds handling for ImageViewAdam Powell2012-09-261-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aa...Xavier Ducrohet2012-09-260-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.Xavier Ducrohet2012-09-260-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Add --error-on-failed-insert option to aapt. do not merge.Xavier Ducrohet2012-09-263-19/+60
* | | | | | | | | Merge "More activity tests." into jb-mr1-devDianne Hackborn2012-09-264-3/+142
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | More activity tests.Dianne Hackborn2012-09-254-3/+142
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Maybe fix issue #7211766: bindService() to User u0 While u10 is..." in...Dianne Hackborn2012-09-2617-164/+313
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Maybe fix issue #7211766: bindService() to User u0 While u10 is...Dianne Hackborn2012-09-2617-164/+313
| |/ / / / / / / /
* | | | | | | | | Merge "Document interaction of SurfaceView and post-layout transforms" into j...Jesse Hall2012-09-261-4/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Document interaction of SurfaceView and post-layout transformsJesse Hall2012-09-261-4/+9
* | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-262-66/+215
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-252-66/+215
* | | | | | | | | | Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Sett...Ashish Sharma2012-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Gl...Ashish Sharma2012-09-261-4/+4
* | | | | | | | | | | Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" in...Romain Guy2012-09-261-20/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIORRomain Guy2012-09-261-20/+12
* | | | | | | | | | | Merge "Multi-user ringtone playback." into jb-mr1-devJeff Sharkey2012-09-269-11/+95
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Multi-user ringtone playback.Jeff Sharkey2012-09-269-11/+95
* | | | | | | | | | | | am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play ser...Joe Malin2012-09-261-18/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" i...Joe Malin2012-09-261-18/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docsJoe Malin2012-09-261-18/+19
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docsJoe Malin2012-09-261-18/+19
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | DOC CHANGE: Fix Google Play services pageJoe Malin2012-09-261-18/+19
* | | | | | | | | | | | | | am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services ...Dirk Dougherty2012-09-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description."...Dirk Dougherty2012-09-261-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-...Dirk Dougherty2012-09-261-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge "Doc change: Update GP services description." into jb-dev-docsDirk Dougherty2012-09-261-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Doc change: Update GP services description.Dirk Dougherty2012-09-261-3/+3