Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev | Jim Miller | 2012-09-23 | 1 | -7/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Better handling of multiple touch events in GlowPadView | Jim Miller | 2012-09-23 | 1 | -7/+26 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev | Jeff Sharkey | 2012-09-23 | 4 | -100/+65 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Always bind to DefaultContainerService as OWNER. | Jeff Sharkey | 2012-09-23 | 4 | -100/+65 | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev | Romain Guy | 2012-09-23 | 4 | -9/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Avoid deadlock when deleting layers | Romain Guy | 2012-09-23 | 4 | -9/+18 | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Increase WFD connect time out to 60s" into jb-mr1-dev | Irfan Sheriff | 2012-09-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Increase WFD connect time out to 60s | Irfan Sheriff | 2012-09-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev | Fabrice Di Meglio | 2012-09-23 | 4 | -9/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIs | Fabrice Di Meglio | 2012-09-23 | 4 | -9/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | Change 5x5 convolve to better test impl. | Jason Sams | 2012-09-23 | 1 | -5/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev | Fabrice Di Meglio | 2012-09-23 | 4 | -15/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIs | Fabrice Di Meglio | 2012-09-23 | 4 | -15/+22 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Verify pass-by-value kernels with structs." into jb-mr1-dev | Stephen Hines | 2012-09-23 | 3 | -0/+128 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Verify pass-by-value kernels with structs. | Stephen Hines | 2012-09-22 | 3 | -0/+128 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor Cell Location public API." into jb-mr1-dev | Wink Saville | 2012-09-23 | 13 | -247/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Refactor Cell Location public API. | Wink Saville | 2012-09-21 | 13 | -247/+59 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge "P2p fixes" into jb-mr1-dev | Irfan Sheriff | 2012-09-23 | 2 | -23/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | P2p fixes | Irfan Sheriff | 2012-09-23 | 2 | -23/+43 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev | Fabrice Di Meglio | 2012-09-23 | 20 | -59/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIs | Fabrice Di Meglio | 2012-09-23 | 20 | -59/+61 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev | Victoria Lease | 2012-09-23 | 6 | -54/+127 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Do not use passive GPS data for COARSE only apps. | Victoria Lease | 2012-09-21 | 6 | -54/+127 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev | Fabrice Di Meglio | 2012-09-23 | 10 | -176/+127 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Fix bug #6427629 Clean up layout direction APIs | Fabrice Di Meglio | 2012-09-23 | 10 | -176/+127 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev | Romain Guy | 2012-09-23 | 2 | -28/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |