summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Hiding a method for JB-MR1Kristian Monsen2012-09-243-13/+2
* 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
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Fix overdraw debug on QCOMRomain Guy2012-09-231-5/+3
| * | | | | | | | | Make sure we never bind to texture #0Romain Guy2012-09-231-23/+21
* | | | | | | | | | Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone...Dianne Hackborn2012-09-231-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to rebootDianne Hackborn2012-09-231-1/+3
* | | | | | | | | | Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-devJeff Sharkey2012-09-231-8/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Check READ_EXTERNAL enforcement outside of lock.Jeff Sharkey2012-09-221-8/+28
* | | | | | | | | | | Merge "Allow acquiring ContentProviders across users." into jb-mr1-devJeff Sharkey2012-09-2315-109/+235
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Allow acquiring ContentProviders across users.Jeff Sharkey2012-09-2115-109/+235
* | | | | | | | | | | Merge "Fix issue #7209355, #7214271." into jb-mr1-devDianne Hackborn2012-09-235-6/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue #7209355, #7214271.Dianne Hackborn2012-09-235-6/+32
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Optimize glyph cache texture uploads" into jb-mr1-devChet Haase2012-09-233-7/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Optimize glyph cache texture uploadsChet Haase2012-09-233-7/+22
* | | | | | | | | | | | Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO...Brian Carlstrom2012-09-231-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be ...Brian Carlstrom2012-09-211-0/+17
* | | | | | | | | | | | | Merge "Further tweak config_minScalingSpan for large screen devices" into jb-...Adam Powell2012-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Further tweak config_minScalingSpan for large screen devicesAdam Powell2012-09-231-1/+1
* | | | | | | | | | | | | | Merge "Fix the build" into jb-mr1-devFabrice Di Meglio2012-09-231-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix the buildFabrice Di Meglio2012-09-231-3/+4
* | | | | | | | | | | | | | Merge "Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales" ...Fabrice Di Meglio2012-09-231-29/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL localesFabrice Di Meglio2012-09-211-29/+90
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb...Fabrice Di Meglio2012-09-235-20/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |