summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." int...Jamie Gennis2011-01-304-16/+26
|\
| * Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycombJamie Gennis2011-01-304-16/+26
| |\
| | * Reset ANativeWindow crop on buffer geometry changes.Jamie Gennis2011-01-284-16/+26
* | | am 71a22b3b: Merge "Dismiss the ticker early if the status bar is tapped." in...Daniel Sandler2011-01-302-0/+6
|\ \ \ | |/ /
| * | Merge "Dismiss the ticker early if the status bar is tapped." into honeycombDaniel Sandler2011-01-302-0/+6
| |\ \
| | * | Dismiss the ticker early if the status bar is tapped.Daniel Sandler2011-01-302-0/+6
* | | | am f2057d90: Merge changes I09e8c4eb,I91a0e05f into honeycombJoe Onorato2011-01-302-2/+8
|\ \ \ \ | |/ / /
| * | | Merge changes I09e8c4eb,I91a0e05f into honeycombJoe Onorato2011-01-302-2/+8
| |\ \ \
| | * | | Use a DateFormat that fits.Joe Onorato2011-01-301-2/+5
| | * | | Update the network info when the configuration changes.Joe Onorato2011-01-301-0/+3
* | | | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-3081-1257/+3930
| |\ \ \ \
| | * \ \ \ am c12cdda9: (-s ours) Merge "DO NOT MERGE: Fix screen size compatibility mod...Dianne Hackborn2011-01-290-0/+0
| | |\ \ \ \
| | * \ \ \ \ am 1358b6a4: Tweak to make merges easierJean-Baptiste Queru2011-01-291-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge 6b739dc7 from gingerbreadJean-Baptiste Queru2011-01-292-1/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-01-290-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into...Dirk Dougherty2011-01-291-1/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am b6c2e2b4: (-s ours) DO NOT MERGE: More robust parsing of NPT time ranges i...Andreas Huber2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge 0ef57993 from gingerbreadJean-Baptiste Queru2011-01-291-1/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 226e5756: (-s ours) Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charge...Jim Miller2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge d350dc04 from gingerbreadJean-Baptiste Queru2011-01-294-4/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 21d0a173: Fix build - javadoc.Nick Pelly2011-01-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856b...Scott Main2011-01-291-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge eab0e97b from gingerbreadJean-Baptiste Queru2011-01-293-40/+95
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 89a54408: (-s ours) Merge "Update networktype before sending state change....Robert Greenwalt2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 591a5f86: Doc change: fix adt archive filename.Dirk Dougherty2011-01-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge ba3dd323 from gingerbreadJean-Baptiste Queru2011-01-291-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for al...Scott Main2011-01-2923-24/+474
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2dce338e: (-s ours) DO NOT MERGE: This particular RTSP server streams MPEG...Andreas Huber2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem p...Dianne Hackborn2011-01-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 138757db: Merge "Make OBB results a one-way call" into gingerbreadKenny Root2011-01-292-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge c33acae9 from gingerbreadJean-Baptiste Queru2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 239fd805: (-s ours) Merge "fix [3361121] hang in glClear() - device unresp...Mathias Agopian2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W ac...Mathias Agopian2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show ...Mathias Agopian2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 043a3cdd: (-s ours) Merge "workaround [3201922] display not on: log full o...Mathias Agopian2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d3fcd0a1: (-s ours) Merge "minor clean-up. SurfaceFlinger doesn\'t need li...Mathias Agopian2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge f126ad3b from gingerbreadJean-Baptiste Queru2011-01-2911-64/+172
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c929677e: Merge "Increase the number of useful bits in the spectrum." into...Marco Nelissen2011-01-291-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b134223f: Make Mifare Classic increment/decrement operands little endianNick Pelly2011-01-291-2/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cc019c0c: Merge "Get mute state from active call." into gingerbreadHung-ying Tyan2011-01-292-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbreadHung-ying Tyan2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d8bdc06f: (-s ours) Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)Jeff Brown2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in...Andreas Huber2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 28c4f69a: Updated checkbox assetsJustin Ho2011-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e81a6e2: Fix trace mismatch.Arnaud Ferir2011-01-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-291-2/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into ging...John Wang2011-01-291-18/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-15 18:14:18 +0000