summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge "First step towards cleaning up Global settings." into jb-mr1-devJeff Sharkey2012-09-261-1/+1
|\
| * First step towards cleaning up Global settings.Jeff Sharkey2012-09-261-1/+1
* | Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()...Philip Milne2012-09-261-3/+3
|\ \
| * | Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()Philip Milne2012-09-261-3/+3
* | | Merge "Reverting public setSoWriteTimeout" into jb-mr1-devBrian Carlstrom2012-09-261-2/+0
|\ \ \ | |_|/ |/| |
| * | Reverting public setSoWriteTimeoutBrian Carlstrom2012-09-261-2/+0
| |/
* | Dream metadata now specified using an xml-resource.John Spurlock2012-09-261-2/+1
|/
* Merge changes I332f020f,I632648ac into jb-mr1-devJeff Brown2012-09-251-1/+1
|\
| * Update references to migrated global settings.Jeff Brown2012-09-251-1/+1
* | Merge "Adding a global accessibility action to open quick settings." into jb-...Svetoslav Ganov2012-09-251-0/+1
|\ \
| * | Adding a global accessibility action to open quick settings.Svetoslav Ganov2012-09-251-0/+1
| |/
* | Add a static generator that takes a Socket Write Timeout ArgumanetAlon Albert2012-09-251-0/+1
|/
* Unhide SSLCertificateSocketFactory.setSoWriteTimeoutBrian Carlstrom2012-09-251-0/+1
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-1/+0
|\
| * Hiding a method for JB-MR1Kristian Monsen2012-09-241-1/+0
* | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-0/+1
|\ \
| * | Adding support for new 'uid2445' column in Calendar's Events table.Sara Ting2012-09-241-0/+1
* | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-3/+3
|\ \ \
| * | | Fix issue #7215984: java.lang.RuntimeException: Unable to create...Dianne Hackborn2012-09-241-3/+3
| |/ /
* | | Add NfcBarcode technology API.Martijn Coenen2012-09-251-0/+8
|/ /
* | Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtim...Philip Milne2012-09-241-1/+1
|\ \
| * | Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"Philip Milne2012-09-241-1/+1
* | | Merge "Fix issue #6926562: Ensure all multi-user cache files are managed corr...Dianne Hackborn2012-09-241-2/+2
|\ \ \
| * | | Fix issue #6926562: Ensure all multi-user cache files are managed correctlyDianne Hackborn2012-09-241-2/+2
| | |/ | |/|
* | | Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()...Philip Milne2012-09-241-1/+1
|\ \ \ | | |/ | |/|
| * | Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()Philip Milne2012-09-211-1/+1
* | | Merge "Add columns to CalendarContract" into jb-mr1-devAlon Albert2012-09-241-0/+2
|\ \ \ | |_|/ |/| |
| * | Add columns to CalendarContractAlon Albert2012-09-201-0/+2
* | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-231-1/+0
|\ \ \
| * | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-231-1/+0
* | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-231-1/+0
|\ \ \ \ | |/ / /
| * | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-231-1/+0
* | | | Merge "Refactor Cell Location public API." into jb-mr1-devWink Saville2012-09-231-21/+20
|\ \ \ \
| * | | | Refactor Cell Location public API.Wink Saville2012-09-211-21/+20
* | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-231-1/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-231-1/+0
* | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-232-21/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-232-21/+1
| |/ / /
* | | | Merge "Fix issue #7209355, #7214271." into jb-mr1-devDianne Hackborn2012-09-231-0/+1
|\ \ \ \
| * | | | Fix issue #7209355, #7214271.Dianne Hackborn2012-09-231-0/+1
* | | | | Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-devEino-Ville Talvala2012-09-231-0/+1
|\ \ \ \ \
| * | | | | Unhide and document feature android.hardware.camera.any.Eino-Ville Talvala2012-09-181-0/+1
* | | | | | Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into j...Wu-cheng Li2012-09-231-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECUREWu-cheng Li2012-09-211-0/+1
* | | | | | Merge "Changing public method to @hide, doesn't have to be public" into jb-mr...Adam Cohen2012-09-211-1/+0
|\ \ \ \ \ \
| * | | | | | Changing public method to @hide, doesn't have to be publicAdam Cohen2012-09-211-1/+0
* | | | | | | Merge "Add Blend intrinsic." into jb-mr1-devJason Sams2012-09-211-0/+34
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add Blend intrinsic.Jason Sams2012-09-211-0/+34
* | | | | | | Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound...Eino-Ville Talvala2012-09-211-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSoundEino-Ville Talvala2012-09-191-0/+1
| | |/ / / / | |/| | | |