summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-devJim Miller2012-09-231-7/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Better handling of multiple touch events in GlowPadViewJim Miller2012-09-231-7/+26
* | | | | | | | | | | | | | | | | | | | | | Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-devJeff Sharkey2012-09-234-100/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Always bind to DefaultContainerService as OWNER.Jeff Sharkey2012-09-234-100/+65
* | | | | | | | | | | | | | | | | | | | | Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-devRomain Guy2012-09-234-9/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Avoid deadlock when deleting layersRomain Guy2012-09-234-9/+18
* | | | | | | | | | | | | | | | | | | | | Merge "Increase WFD connect time out to 60s" into jb-mr1-devIrfan Sheriff2012-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Increase WFD connect time out to 60sIrfan Sheriff2012-09-231-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-234-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-234-9/+17
* | | | | | | | | | | | | | | | | | | | | | Change 5x5 convolve to better test impl.Jason Sams2012-09-231-5/+17
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-234-15/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-234-15/+22
* | | | | | | | | | | | | | | | | | | | | | Merge "Verify pass-by-value kernels with structs." into jb-mr1-devStephen Hines2012-09-233-0/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Verify pass-by-value kernels with structs.Stephen Hines2012-09-223-0/+128
* | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor Cell Location public API." into jb-mr1-devWink Saville2012-09-2313-247/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Refactor Cell Location public API.Wink Saville2012-09-2113-247/+59
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "P2p fixes" into jb-mr1-devIrfan Sheriff2012-09-232-23/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | P2p fixesIrfan Sheriff2012-09-232-23/+43
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-2320-59/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-2320-59/+61
* | | | | | | | | | | | | | | | | | | | | | | Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-devVictoria Lease2012-09-236-54/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Do not use passive GPS data for COARSE only apps.Victoria Lease2012-09-216-54/+127
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-2310-176/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-2310-176/+127
* | | | | | | | | | | | | | | | | | | | | | | Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-devRomain Guy2012-09-232-28/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |