summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow applications to connect to known wifi displays.Jeff Brown2012-09-264-40/+51
* Make DreamManagerService more robust.Jeff Brown2012-09-2613-577/+615
* Move DreamManagerService to its own package.Jeff Brown2012-09-263-5/+3
* 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
* | | | | | | | | | | | Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global"...Xia Wang2012-09-261-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix Wifi Stress test after wifi settings are moved to Settings.globalXia Wang2012-09-261-7/+8
* | | | | | | | | | | | | am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docsScott Main2012-09-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docsScott Main2012-09-261-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am ed5ff3bd: add analog clock attributes to docsScott Main2012-09-261-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | add analog clock attributes to docsScott Main2012-09-261-0/+4
* | | | | | | | | | | | | Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-devXavier Ducrohet2012-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | am 16eb5366: am 54645245: am 14a36625: fix markup bugsScott Main2012-09-261-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 54645245: am 14a36625: fix markup bugsScott Main2012-09-261-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 14a36625: fix markup bugsScott Main2012-09-261-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | fix markup bugsScott Main2012-09-261-3/+2
| | | | |_|/ / / / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | Merge "Applies a layer's color filter even when the layer is a quad Bug #7238...Romain Guy2012-09-261-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Applies a layer's color filter even when the layer is a quadRomain Guy2012-09-261-5/+5
* | | | | | | | | | | | Merge "Dream metadata now specified using an xml-resource." into jb-mr1-devJohn Spurlock2012-09-263-18/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Dream metadata now specified using an xml-resource.John Spurlock2012-09-263-18/+23
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Assign default texture id of 0" into jb-mr1-devChet Haase2012-09-265-15/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Assign default texture id of 0Chet Haase2012-09-265-15/+13
* | | | | | | | | | | | | am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs...Xavier Ducrohet2012-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | / / / / / / / | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |