Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge into jb-mr1-dev | Jean-Baptiste Queru | 2012-09-25 | 1 | -13/+16 |
|\ | |||||
| * | Camera: Improve enableShutterSound documentation. | Eino-Ville Talvala | 2012-09-24 | 1 | -13/+16 |
* | | Merge into jb-mr1-dev | Jean-Baptiste Queru | 2012-09-25 | 4 | -48/+91 |
|\ \ | |||||
| * | | Add a property to disable libhwui's scissor optimization | Romain Guy | 2012-09-24 | 4 | -48/+91 |
* | | | Merge into jb-mr1-dev | Jean-Baptiste Queru | 2012-09-25 | 5 | -133/+76 |
|\ \ \ | |||||
| * | | | Fix issue #7215984: java.lang.RuntimeException: Unable to create... | Dianne Hackborn | 2012-09-24 | 5 | -133/+76 |
* | | | | Add NfcBarcode technology API. | Martijn Coenen | 2012-09-25 | 4 | -2/+121 |
* | | | | Merge "Fix build" into jb-mr1-dev | Michael Jurka | 2012-09-24 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix build | Michael Jurka | 2012-09-24 | 1 | -1/+1 |
* | | | | | Merge "Test image for 2 input tests." into jb-mr1-dev | Jason Sams | 2012-09-24 | 2 | -0/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Test image for 2 input tests. | Jason Sams | 2012-09-24 | 2 | -0/+0 |
* | | | | | Merge "UI test automation service should not be auto reconnected." into jb-mr... | Svetoslav Ganov | 2012-09-24 | 1 | -28/+10 |
|\ \ \ \ \ | |||||
| * | | | | | UI test automation service should not be auto reconnected. | Svetoslav Ganov | 2012-09-24 | 1 | -28/+10 |
* | | | | | | Merge "Properly launch quicksettings activities." into jb-mr1-dev | Daniel Sandler | 2012-09-24 | 5 | -19/+35 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Properly launch quicksettings activities. | Daniel Sandler | 2012-09-24 | 5 | -19/+35 |
* | | | | | | Merge "Updated versions of DroidSansFallback" into jb-mr1-dev | Bart Sears | 2012-09-24 | 3 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Updated versions of DroidSansFallback | Bart Sears | 2012-09-24 | 3 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-m... | Siva Velusamy | 2012-09-24 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not preload videoeditor_jni since it breaks the emulator | Siva Velusamy | 2012-09-24 | 1 | -1/+0 |
* | | | | | | | Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtim... | Philip Milne | 2012-09-24 | 6 | -9/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" | Philip Milne | 2012-09-24 | 6 | -9/+9 |
* | | | | | | | | Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev | Michael Jurka | 2012-09-24 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix security check for private allocateAppWidgetId api | Michael Jurka | 2012-09-21 | 1 | -2/+1 |
* | | | | | | | | | Merge "Fix issue #6926562: Ensure all multi-user cache files are managed corr... | Dianne Hackborn | 2012-09-24 | 3 | -9/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix issue #6926562: Ensure all multi-user cache files are managed correctly | Dianne Hackborn | 2012-09-24 | 3 | -9/+48 |
* | | | | | | | | | | Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()... | Philip Milne | 2012-09-24 | 6 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos() | Philip Milne | 2012-09-21 | 6 | -9/+9 |
* | | | | | | | | | | Merge "Fix issue #7214090: Need to be able to post notifications to all users... | Dianne Hackborn | 2012-09-24 | 17 | -65/+125 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix issue #7214090: Need to be able to post notifications to all users | Dianne Hackborn | 2012-09-24 | 17 | -65/+125 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Fix the build." into jb-mr1-dev | Robert Greenwalt | 2012-09-24 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix the build. | Robert Greenwalt | 2012-09-24 | 1 | -0/+10 |
* | | | | | | | | | | Merge "Skip operations for users who are not running" into jb-mr1-dev | Alon Albert | 2012-09-24 | 2 | -19/+65 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Skip operations for users who are not running | Alon Albert | 2012-09-21 | 2 | -19/+65 |
* | | | | | | | | | | | Merge "Add columns to CalendarContract" into jb-mr1-dev | Alon Albert | 2012-09-24 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add columns to CalendarContract | Alon Albert | 2012-09-20 | 2 | -0/+18 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | resolved conflicts for merge of 814f5ac3 to jb-mr1-dev | Amith Yamasani | 2012-09-24 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS... | Amith Yamasani | 2012-09-24 | 1 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade" | Amith Yamasani | 2012-09-24 | 1 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge "Fixing services start order that impacts ICS - JB upgrade" | Amith Yamasani | 2012-09-23 | 1 | -5/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Fixing services start order that impacts ICS - JB upgrade | Felipe Ramos | 2012-09-18 | 1 | -5/+6 |
* | | | | | | | | | | | | | | Merge "Allow apps to getProviders() without location permissions." into jb-mr... | Victoria Lease | 2012-09-24 | 1 | -13/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Allow apps to getProviders() without location permissions. | Victoria Lease | 2012-09-23 | 1 | -13/+29 |
* | | | | | | | | | | | | | | | am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-09-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-09-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Show plmn in emergency call allowed mode. | John Wang | 2012-09-21 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | Get your own cursor Drawables, WebViewClassic! | Victoria Lease | 2012-09-21 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev | Kenny Root | 2012-09-24 | 2 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | LockScreen: don't update KeyStore password on unlock | Kenny Root | 2012-09-21 | 2 | -4/+0 |
* | | | | | | | | | | | | | | | | | Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev | John Spurlock | 2012-09-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Migrate away from lightsOut() in BeanBagDream. | John Spurlock | 2012-09-21 | 1 | -1/+1 |