summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-13/+16
|\
| * Camera: Improve enableShutterSound documentation.Eino-Ville Talvala2012-09-241-13/+16
* | Merge into jb-mr1-devJean-Baptiste Queru2012-09-254-48/+91
|\ \
| * | Add a property to disable libhwui's scissor optimizationRomain Guy2012-09-244-48/+91
* | | Merge into jb-mr1-devJean-Baptiste Queru2012-09-255-133/+76
|\ \ \
| * | | Fix issue #7215984: java.lang.RuntimeException: Unable to create...Dianne Hackborn2012-09-245-133/+76
* | | | Add NfcBarcode technology API.Martijn Coenen2012-09-254-2/+121
* | | | Merge "Fix build" into jb-mr1-devMichael Jurka2012-09-241-1/+1
|\ \ \ \
| * | | | Fix buildMichael Jurka2012-09-241-1/+1
* | | | | Merge "Test image for 2 input tests." into jb-mr1-devJason Sams2012-09-242-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Test image for 2 input tests.Jason Sams2012-09-242-0/+0
* | | | | Merge "UI test automation service should not be auto reconnected." into jb-mr...Svetoslav Ganov2012-09-241-28/+10
|\ \ \ \ \
| * | | | | UI test automation service should not be auto reconnected.Svetoslav Ganov2012-09-241-28/+10
* | | | | | Merge "Properly launch quicksettings activities." into jb-mr1-devDaniel Sandler2012-09-245-19/+35
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Properly launch quicksettings activities.Daniel Sandler2012-09-245-19/+35
* | | | | | Merge "Updated versions of DroidSansFallback" into jb-mr1-devBart Sears2012-09-243-0/+5
|\ \ \ \ \ \
| * | | | | | Updated versions of DroidSansFallbackBart Sears2012-09-243-0/+5
| |/ / / / /
* | | | | | Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-m...Siva Velusamy2012-09-241-1/+0
|\ \ \ \ \ \
| * | | | | | Do not preload videoeditor_jni since it breaks the emulatorSiva Velusamy2012-09-241-1/+0
* | | | | | | Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtim...Philip Milne2012-09-246-9/+9
|\ \ \ \ \ \ \
| * | | | | | | Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"Philip Milne2012-09-246-9/+9
* | | | | | | | Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-devMichael Jurka2012-09-241-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix security check for private allocateAppWidgetId apiMichael Jurka2012-09-211-2/+1
* | | | | | | | | Merge "Fix issue #6926562: Ensure all multi-user cache files are managed corr...Dianne Hackborn2012-09-243-9/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #6926562: Ensure all multi-user cache files are managed correctlyDianne Hackborn2012-09-243-9/+48
* | | | | | | | | | Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()...Philip Milne2012-09-246-9/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()Philip Milne2012-09-216-9/+9
* | | | | | | | | | Merge "Fix issue #7214090: Need to be able to post notifications to all users...Dianne Hackborn2012-09-2417-65/+125
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix issue #7214090: Need to be able to post notifications to all usersDianne Hackborn2012-09-2417-65/+125
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Fix the build." into jb-mr1-devRobert Greenwalt2012-09-241-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix the build.Robert Greenwalt2012-09-241-0/+10
* | | | | | | | | | Merge "Skip operations for users who are not running" into jb-mr1-devAlon Albert2012-09-242-19/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Skip operations for users who are not runningAlon Albert2012-09-212-19/+65
* | | | | | | | | | | Merge "Add columns to CalendarContract" into jb-mr1-devAlon Albert2012-09-242-0/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add columns to CalendarContractAlon Albert2012-09-202-0/+18
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | resolved conflicts for merge of 814f5ac3 to jb-mr1-devAmith Yamasani2012-09-241-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS...Amith Yamasani2012-09-241-5/+6
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"Amith Yamasani2012-09-241-5/+6
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Fixing services start order that impacts ICS - JB upgrade"Amith Yamasani2012-09-231-5/+6
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fixing services start order that impacts ICS - JB upgradeFelipe Ramos2012-09-181-5/+6
* | | | | | | | | | | | | | Merge "Allow apps to getProviders() without location permissions." into jb-mr...Victoria Lease2012-09-241-13/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Allow apps to getProviders() without location permissions.Victoria Lease2012-09-231-13/+29
* | | | | | | | | | | | | | | am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Show plmn in emergency call allowed mode.John Wang2012-09-211-2/+2
| | * | | | | | | | | | | | | | Get your own cursor Drawables, WebViewClassic!Victoria Lease2012-09-211-3/+3
* | | | | | | | | | | | | | | | Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-devKenny Root2012-09-242-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | LockScreen: don't update KeyStore password on unlockKenny Root2012-09-212-4/+0
* | | | | | | | | | | | | | | | | Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-devJohn Spurlock2012-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Migrate away from lightsOut() in BeanBagDream.John Spurlock2012-09-211-1/+1