labofsahil/github-event-dataset-2012 huggingface dataset:
Audio: Restore volume for all streams on headset connect/disconnect

Audio streams which play sound from both speaker and a connected device would
report to AudioService only the speaker as the playback device, meaning volumes
would not be saved for a separate device state. This patch makes it so the
connected device will be reported instead, fixing volume restore on device
change for those streams (alarm, ring, notifications).

Readded safe headset restore capping for all streams.

Patch Set 3: Changed cap to 10/15

Change-Id: Id2e690f7894475ba0086f62342b8eeb163d24da1
Merge "Audio: Restore volume for all streams on headset connect/disconnect" into jellybean
Add separate headset and speaker volumes

This is a simple implementation of keeping separate volume
settings for the wired headset and the speaker without
overhauling the audio system.

This allows a person with sensitive headphones to keep music, ringer
and other stream volumes lower than they would usually keep the
speaker volumes.

Change-Id: Ia614c1e3ac548ff4e0104a090cda13b9daef09cb
Merge "Add separate headset and speaker volumes" into ics
moved test files for sake of unit testing from ant
Updated build instructions and added group to readme
Removed old target
Removed unused reference to NeighbourData class
Made some changes to mpiIO classes and testing code.
[maven-release-plugin] prepare release jackson-module-jsonSchema-2.1.0
message inputs
conifers added
moved to the submodule
moved to the submodule
Merge branch 'master' of https://github.com/HeraldStudio/herald-session-service.git
Here is a nice, clean copy of the org.eclipse.jdt.ui source from the released version of Eclipse Helios 3.6.2.  It should build correctly if imported as a
plugin project in Eclipse.  If we need the .project file to make it work, I'll send it out to people or we can unignore it.
- add break to prevent unnessessary task identifier checks.
Button Light Notification (settings part 1/2)

BLN quiet hours part
    patch made by Rdlgrmpf (Robin Morawetz) for IceColdSandwich rom
    for Desire HD
Add feature to allow making game easier
Odstranění starého SQL z repositáře
Merge branch 'master' into knihy-devel
Removed sprites, the generated sprite was 3.8MB :|
PatternUnlockScreen: Battery status can be shown if desired.

It uses same option that LockScreen (lockscreen_always_battery)
Until now, only showed if it was charging or it had low level.

Change-Id: Id4f8edf42775eb43f0602ab2e86b909827af4b65
Externalize symbol picker options to resources

Having the symbol picker options in resources allows a change to be made for
a specific device, and even for a specific locale (change in overlay).

Change-Id: I1c6da0e252dae10c7c2f5433193b946540eda376
Merge "PatternUnlockScreen: Battery status can be shown if desired." into gingerbread
Sanity check item for being non-null.

This normally shouldn't happen, but experience has shown that there are
some rare corner cases where it indeed happens. The exact conditions are
unclear, but it's likely related to an ACTION_CANCEL event being sent
out before the ACTION_UP event.
In order to not crash in weird, hard-to-debug corner cases, just check
whether we actually have an item to process.

This fixes http://code.google.com/p/cyanogenmod/issues/detail?id=4985.
Merge "Externalize symbol picker options to resources" into gingerbread
Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_frameworks_base into gingerbread

Conflicts:
	core/res/res/values/strings.xml
	policy/src/com/android/internal/policy/impl/FingerUnlockScreen.java

Change-Id: I6ed2bdbb26a76351866daeb9d299c0cbeece8e6f
Implement methods for Caesar cipher (enciphering/deciphering)
Implement CaesarInputStream
Implement CaesarOutputStream
Create a simple test program that test CaesarInputStream
backing out of devise
Revert "backing out of devise"

This reverts commit 5968a7f1f9d0f8397ccddd63bd42c9b2cf316381.
Merge branch 'master' into devise
add faux123 kernel repo for grouper

manual_add_kernel_manifest.sh needs to be executed _from the
build root dir_ first, to download the kernel source.

Change-Id: Ifa995de70aa84da8aab4b368b72a23dd05ac7332
Signed-off-by: sethyx <sethyx@gmail.com>
Merge branch 'jb' of https://github.com/AOKP/platform_manifest into jb
v26-r0
Update list of likers in title attribute after clicking like or unlike
added a comment

due to testing
agregando footer faltan pruebas
Organize: MultiEncodedUri moved to orga.uri
FixBug: The renderer cannot set a member
Alter: Renew documents
Configure opamp as a voltage follower
plot barcode structure and store the barcode entity in synapse in order to analyse it .
correct the issue with wrong "THREE_YEAR_OS" (remove this variable). a "3yos" variable is created afterwards in the predictive models script, this one is the good one !
Changes :
1) Added support to customize the font and position of the highlighted state text position.
2) Add support to customize the marker value and marker image offset from the slider.
update README info from the old API
Added commerce_extra_price_formatters to allow store managers to add discount messages to prices
Added commerce feature in order to be able to export commerce config to features
Added commerce_backoffice to tidy up the commerce backend
Added add to cart popup message
Added field_extractor module
Added image delta formatter module
Removed info and profile from spirelight commerce in prep to use as a base for a platform on aegir with various install profiles
Prepared to be SpireLight Commerce base
Tabs Spaces Battle
skia: ics-mr1-release compatibility update
Merge relevant functions and definitions for readPixels, canUseGpuRendering, drawdrawAltCanvas, and fData. Cleanup ifdef conditionals between headers and source files. Comment modified and unused functions from existing Skia, then replace with alterations. Add missing sources.
Added Trenz Electronic TE0600 (GigaBee) EAGLE part library
Initial support for Galaxy Cooper
Merge pull request #1 from PabloPL/2.6.35-cooper

Initial support for Galaxy Cooper
Add generic devices config for Samsung Phones based on MSM7x27
Merge branch 'mainline'
Remove MSM7x25 and Europa config option from board-callisto
Increase MSM_MAX_PARTITIONS value from 8 to 16, because Samsung msm based devices have more than 8 partitions
Add Samsung vibrator driver
Revert "Add Samsung vibrator driver"

This reverts commit 6b70f5fe2b79af80d4bcf2be6282ef85231f06cd.
Add BMA222 sensor driver
Add tmd2771 proximity/light sensor driver
Add mmc328x sensor driver
Update KGSL
Use GPIO const values defined in board-cooper.h header
Add original Samsung OUT voltage settings
Clear board-cooper from 7x25 checks
- move samsung out_voltage_settings enum into header file
- remove smc91x code from Galaxy Cooper board
Use the same value for msm_shared_ram_phys like in original sources
Merge pull request #3 from PabloPL/2.6.35-cooper

Update Galaxy Cooper support
Update some derp
BUGFIX timeZoneString should return +0000 for UTC

timeZoneString returns '+0100' for UTC+1, but returned just '+' for
UTC+0 when in fact it should return '+0000'
Added the php lint back into the build process.
fix individu qui ne disparaissaient pas avec la nouvelle position de la sortie
Vanilla Kernel FTW
#3 : Added new files and changes some of the other files
#3 : More changes addded to File1.txt
#5: More changes
Use a more generic approach.

Now instead of having 2 profiles, I have one profile with 2 optional services.

This allows for the same profile to handle two devices, preventing issues with
multiple connections to the same device on LE cases.
we compiled this against an intermediate version between 0.5.4a and 0.5.6
uploading a previous release
tagging 1.001
adding release v1.001 apk
working on gast
works locally. call separately for each lane
Linked Backbone.js name to the Backbone site in the readme
Bug fixing for breadcrumb
Removed HISTORY and ROADMAP
History
mise a jour du titre du site
amelioraton de la traduction
mise a jour du lien vers twitter, traduction dans les modes de lecture
debut de traduction pour ressources.md
traduction de la page des ressources. mise aj our du lexique
removed the package.json because we moved away from node and are using couchapp for testing (web).
added jquery, and the couchdb user model files/tests.
commented out code in the couchdb user model (wasn't compiling)
got everything set up so that mocha is running and we have no errors
license in docs
update to add delete method
format testing page
updates all tests working Get/Post/Put/Delete
update
update
Default colors
Stream layout
new build_number=120107104 and uuid=13f1621294b5dad3511a552f90b890a55ac64d55
section about Von Neumann, Nash, McCarthy, Deep Blue, Gasparov and Levine
started slides on environment and simulation
Updates
Merge branch 'master' of github.com:comfirm/comfirm-dmarc-report-server
Overhauled the layout of the report
Merge branch 'master' of github.com:connors511/WeatherDataVisualization
Añadido módulo cifs.
Remove LESS.js
added Transfer file dialog

Transfer file Dialog is added in dropdown menu in toolbar.
orthogonalize MIPS version identifiers
Lockscreen: Fix NPE (softreboot) if WeatherPanel is null

Change-Id: Ied008c185558d0957011bfc0bef7c6a166df9d72
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'aokp/jb' into aokp-jb
fix

Change-Id: I126f73d7296286e824d107f203712ac94072e29f
Estrutura inicial - Basica
computed obervable demo cleanup
simple null check for fails
jta rollback test case
Transacted JMS in action
Fixed PHPDocs.
Include scrollview by default on detail views.
Methode TimelineElement.setCreated_at wiederbelebt, die der Merge in 24d8fff53867c2480002d8b63a117de021e256c8 entfernt hat.
got rid of old tmux. added syntastic to vim
fixed a few locations to fit back with Funtoo
Merge branch 'next' of github.com:fearedbliss/Bliss-Initramfs-Creator into next
not member validations in Payment creation
no dni required in admin
fix yaml
REFACTOR: member.direct_debit not associated to payment.payment_method
Payment.paid_at required
Payment.paid_at not allow blank
removing monthly option
Rolled versions for next dev iteration
lesson 3 sample solutions
Reorganised Javascript section. Added plugins to JS. Need reorganisation
INTSAMPLES-99 Upgrade samples to SI 2.2.0.RELEASE
For reference see: https://jira.springsource.org/browse/INTSAMPLES-99
Merge pull request #75 from ghillert/INTSAMPLES-99

INTSAMPLES-99 Upgrade samples to SI 2.2.0.RELEASE
use manufacturer code as fallback
document result context dependency
slurp the whole command output
restrict the search to /sys/devices
no need for a regexp here
use getAllLines function
skip empty files
use getAllLines function
use getAllLines function
cosmetics
new samples, old samples renaming
implement model-specific hack for serial number

closes: 1607
update samples set
use an atomic reference, not a transient variable
unit test for automatic port selection.
Huahin Frameworkを追加
got haml coffee templates working
added undo and undo to
updated hp conent
0.16.0 is released, switch to that version (instead of SNAPSHOT)
add .gitignore
Changed README format
Deleted old README
delete several site entity
wut??
Updated the Notifications ArrayProxy so the Notification model is
injected in rather than it assumed.
Recreate tm, basic logging and exceptions
Merge pull request #1 from josiahsprague/master

Test if type attribute exists
preventSubmit set incorrectly in defaults array.
Removing debug code
Including license terms
adding aria-invalid and role=alert logic
#4 minlength validator incorrectly rejecting exactly-equal lengths
#2 form submit accidentally removed
mifosx-58: wip refactoring of loan schedule api.
1日目 誤字修正
remove sd cache project
starting to add security features
Capistrano installed
updated ZONT
livegamewindow eingecheckt.
imprime ponteiro como string
Cometendo :D
comment2
Merge remote-tracking branch 'ED/master'
removido os arquivos de project do eclipse
added step to enter javascript_console.tmbundle, and spelling mistake - submoule to submodule
Merge pull request #6 from stefmikhail/patch-1

added step to enter into the javascript_console.tmbundle, as well as spelling mistake of submoule to submodule
prototype completed, not tested!
Changed header a bit, added some base functions.
Support for Ruby 1.8.7 milliseconds in screen shot file name
Fix jshint issues with duplicates, added csscomb (again?)
Merge branch 'master' of github.com:miguelbermudez/janus-customizations
fixing my submodule screwup
Merge branch 'AboutPage' of git://github.com/Kepner/seneca-Project-Management into temp

Conflicts:
	PRJ666-Implementation/nbproject/private/private.xml
Fixed header on all pages. Added in News Entity and home page currently displays news
Merge branches 'master' and 'master' of github.com:mozilla-services/server-syncstorage
Bug 703537: Rename AbstractWrapper to IndirectWrapper + adding comments; r=bholley
Finished hovercards
Fix syntax highlight error
Add call callEchofon()
Almost Done...
?
Added Readme

Added Readme file with the same description as the project itself.
Added .cache files to ignore

Added .cache to the ignore list
Update prebuilt kernel with version 3.3
Corrected unique submission data checking.
Update files/ecgm.txt
Use header on 204 response to allow actual 204 from service
edits for correct mounts
modified:   BoardConfig.mk
	deleted:    UsbController.cpp
	deleted:    board-info.txt
	deleted:    device.mk
	deleted:    full_ms910.mk
	deleted:    init.qcom.rc
	modified:   ms910.mk
	deleted:    prebuilt/lib/modules/ansi_cprng.ko
	deleted:    prebuilt/lib/modules/cifs.ko
	deleted:    prebuilt/lib/modules/cls_flow.ko
	deleted:    prebuilt/lib/modules/cpaccess.ko
	deleted:    prebuilt/lib/modules/dal_remotetest.ko
	deleted:    prebuilt/lib/modules/dma_test.ko
	deleted:    prebuilt/lib/modules/evbug.ko
	deleted:    prebuilt/lib/modules/hdmicec.ko
	deleted:    prebuilt/lib/modules/librasdioif.ko
	deleted:    prebuilt/lib/modules/mtd_erasepart.ko
	deleted:    prebuilt/lib/modules/mtd_nandecctest.ko
	deleted:    prebuilt/lib/modules/mtd_oobtest.ko
	deleted:    prebuilt/lib/modules/mtd_pagetest.ko
	deleted:    prebuilt/lib/modules/mtd_readtest.ko
	deleted:    prebuilt/lib/modules/mtd_speedtest.ko
	deleted:    prebuilt/lib/modules/mtd_stresstest.ko
	deleted:    prebuilt/lib/modules/mtd_subpagetest.ko
	deleted:    prebuilt/lib/modules/mtd_torturetest.ko
	deleted:    prebuilt/lib/modules/oprofile.ko
	deleted:    prebuilt/lib/modules/qce.ko
	deleted:    prebuilt/lib/modules/qcedev.ko
	deleted:    prebuilt/lib/modules/qcrypto.ko
	deleted:    prebuilt/lib/modules/reset_modem.ko
	deleted:    prebuilt/lib/modules/sch_dsmark.ko
	deleted:    prebuilt/lib/modules/scsi_wait_scan.ko
	deleted:    prebuilt/lib/modules/tun.ko
	deleted:    prebuilt/lib/modules/wireless.ko
	deleted:    unzip-files.sh
Styled checkbox to be more inline with the text.
Reorganize puppet report processors
Change report path depending on puppet version
Use clientcert over fqdn

Certs named for clientcert will definitely exist; fqdn not so much.
update Capture methods"
Updated FileTransfer
[CB-795] Added HTTP status code to WP7 FileTransferError interface. Catches 404 on download.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7
added license header
Files updated!
Merge branch 'master' of github.com:raphaelsc/dcpu16-bits--reformulated
#2 closed.
Transaction 46353501 by Sandb.
Transaction 54396233 by Joren.
Merge pull request #1 from rmholl0/master

Added Create DIP and README
it makes more sense for the title to be "what" than "who"
Merge pull request #2 from rmholl0/master

Build ERC SIP updates
updated modification factor
Removed unneeded animations when filter is applied

We don't need to animate all just a few that would
be in view. The rest can just pop up. This should
improve responsiveness when changing the filter on
slower devices, such as netbooks or handhelds.
Fixed bug - group giveaways not showing up

Intoruced in @bcf807e
Tweaking Rakefile and Bootstraper
Tweaking Rakefile and Bootstraper
Pushed all playgrounds into Google Places, updated database with Places id, migrations for that and seed file and scripts for updated data
added pylibmc django support for travis
Link to articles was incorrect.
remove PHP4 FAQ
Forbid mports check description were updated.
.project file was reverted
Merge pull request #27 from daniilyar/master

ForbidCertainImportsCheck docs were updated.
repo was changed
Deploy shell-script was created
New deploy script.
Some bugs in Logic condition need optimization check was fixed
Merge pull request #44 from sabaka/master

Deploy shell-script was created
making type setting consistent
初期データの修正、登録時の処理を修正
アソシエーションを追加、日本語化対応
tesing another blank
Removed tracking some files
Minor code formatting discount-functions.php
Update for 3.4
My notes when doing the real time workshop
About dialog links to work
Released as 0.1.2
Merge pull request #4 from tanty/about-links-to-work

About links to work
Enable OTG storage

Dependent on
http://review.cyanogenmod.org/#/c/29054/

Change-Id: I73979c63f862ad9ad847375d99ebbcf858d0a673
Color scheme added
added submodule init/updates
changed name of README
updated project structure after move
tweaking markdown rendering (yawn)
updated README.md
More slides, and maven project demonstrating jasmine
testing reference
after testing
added logging and small fixes
I want to pass green also on Jenkins
add in basic clearing of card_number and ccv_number
Add tests to verify the strip_sensitive_info=False use case
Make sure all of the CCDF tests run on the Authorize form as well
doh -- add the actual tests
Add in ability to specify what gets stripped
Simplify this code to only strip when there's something to strip
Extract is_valid() code into a mixin so it can be re-used
One last strip_sensitive_info property
Merge remote-tracking branch 'armstrong/master' into sensitive-info
fix kwargs not getting passed through to get_context_data

in the standard django views, kwargs get passed down from dispatch to get_context_data
this didn't happen in the DonationFormView. So I removed the custom
get() method. TemplateView's get() gets used instead.
Make sure that get_context_data() does the right thing
Extract methods to parent
Make sure kwargs get passed to form_is_invalid
Make sure kwargs are passed from form_is_invalid
Simpify this code
Make sure that kwargs are passed to form_is_valid
Move to the correct test class
Make srue that kwargs are passed through to get_context_data
Merge pull request #1 from tswicegood/fix-missing-kwargs

Updated to make sure kwargs and context are handled properly
Merge pull request #25 from crccheck/fix-missing-kwargs

Fix kwargs not getting passed through to get_context_data
Add endpoint to check plugin availability

* The ping() endpoint confirms that the plugin is
installed on the ushahidi deployment
fix long polling example, removing trailing comma
send old messages together when using jsonp
improving log function to work on IE8 and IE9 too
adding support to change keys names on template message
adding some headers to allow cross domain requests
using XDomainRequest as first option for IE browsers
rertuning only header when sending response 304 for long polling connections
adding a timeout onerror callback to non JSONP long polling connections
 enable push stream client to use 443 as non ssl port to prevent caching that occurs on some proxies on 80 port
Added a End of batch flag for client of pushtream.js to know when it is finished receiving a long polling batch. End of batch flag is set to true for all transport except long polling  when the client can receive a batch of messages at once in between 2 long polling request. This is to help client pushstream.js to implement some filter logic at batch level (for example discard stale messages)
adding a way to pass extra parameters in subscriber url, the extraParams function will be called before each connection to server
removing old iframe elements on stream wrapper
change use of ngx_http_finalize_request on ngx_http_push_stream_send_response_finalize function to run cleanup connection properly
Fixed : Virus fork successfuly repaired, and now works safely
Adds login view.
Adds session controller.
Adds login bar.
Require login.
Do not add providers if they are not used to login.
Adds models for holding twitter information.
adds twitter signup/login logic to auth callback.
Adds login configuration flags for twitter.
Fix CS
Refactor tests autoloading
Update travis config
Fixing evil extra parens added by code completion.
fix url filter
Added set algebra classes
Updating on the repo outage for 31/07/2012.
deleting useless comment to test commit ability
Site updated at 2012-10-30 21:34:11 UTC
Dynamic updation.
Tidied TestData logging
found out we haven't got ROOT :')
mint: remove idd blob

Change-Id: I6361d568bd26303add806ef60974a40e45db4d82
udpated
Merge branch 'master' of https://github.com/DeloitteConsultingIndia/BlackFlag3.0

Conflicts:
	BF-3-0-01Nov2012-soapui-project/WebRTC-TestSuite/element.order
fixed warning: multi-line strings not supported in arch/arm/mach-msm/Kconfig
added XZ compression and decompression support for kernel and ramdisk
added XZ compression support for squashfs
updated defconfig: enabled squashfs and added XZ compression support for squashfs
updated ramzswap to ZRAM and enabled it (with many fixes thanks to @faux123)
removed leftover ramzswap files
added ZCACHE, CLEANCACHE, FRONTSWAP (thanks to @faux123)
updated defconfig to enable zcache, cleancache, frontswap & some fixes for zcache
updated JHASH to v3
shifted default TCP congestion algorithm to VENO
updated release version - v03
Smooth Spinners CM
Update README.md

Change license to GPLv3
adding a Richard W. Furse distance filter udef

to be inserted between the sound source and the panner. We can try
this, to decide later wether it should be built into the wfs pre-panners
hi
Merge branch 'master' of github.com:HawaiianNinja/RoseHulman-Android-App
I mad the bandiwdth page sexier by hinding elements until it was done loading
added second results query to capture lowercase leftovers
added no results found string
added admin dropdown to set maximum allowed returned values
updated README.txt
improved styling a bit
Merge pull request #3 from DannyJoris/6.x

6.x
Adicionando prioridade no produto
<Impl> 1st impl. of the Character.
<Impl> 1st impl. of the Character.
Merge branch 'master' of github.com:JeuxVideoAtInsa/GameJam1-SpaceSquare
Add front matter to docs test file
Added favicon edited Rakefile to automatically include draft: true when creating a new post so that it's not automatically published. Added some test posts
DON'T USE // AS COMMENTS yeah...
Everything had for Release two.

Added Servlets for the gui to use.

Signed-off-by: Marek Fewtrell <Marek.few@gmail.com>
Removing unneeded test data
Fix clearings for small screens
Tightend up code on MediaHomeButton & Scrollbars
Included SideBlade into KioskMode
Comment maven-confluence-plugin in pom.xml
Add result (success /fail) after upload new page
Modify sampling rate to equilibrate performance-battery
Update Readme to clarify use cases
libsensors: Fix typo

Change-Id: I42bb0cf21bc14ff9a9fca4d20d07810fad232b51
Network Staff makes me Crazy. Trying to abstract it
Edinig readme...
Timeline fixes and Cancel function
Reevert "merge OMAP_ENHANCEMENT flags from omapzoom.org"
Pull in clean patch from review
This reverts commit b1939b5e8a2eb141fab84461b74a1530b0833cea.
Add OMAP_COMPAT and OMAP_ENHANCEMENT frameworks flags

OMAP_ENHANCEMENT is for omapzoom stuff, if required...

OMAP_COMPAT will be required soon to use the specific
wlan and omap3 codecs. (Same as CM7)

PS: We already use omap3-compat as hardware/ti/omap3
    on the defy ics version since months...
Required for fraomeworks/base change Ibf3d01d213f1804c90c70119b638897b4fdbbb36

Change-Id: I7e9d9abd39b8bf5b62fa5583241eb0fcfffaba01
Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>
Merge OMAP_ENHANCEMENT code from omapzoom.org (2/2)

Provides increased media codec support for phones with OMAP4 processors
Needs system/core change I13efb6c8faafda04597bb2e7e0144e15c7fc7ccf (1/2)

system.prop: com.ti.omap_enhancement=true
BoardConfig: OMAP_ENHANCEMENT := true
ifdef OMAP_ENHANCEMENT
COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT -DTARGET_OMAP4
endif
Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>

Change-Id: Ibf3d01d213f1804c90c70119b638897b4fdbbb36
WeatherInfo : Catch NumberFormatException

Catch the exceptions incase of empty/invalid data.

Change-Id: I243a14ccbee53034dd39a1d79a6ab79eff4bd263
Merge "WeatherInfo : Catch NumberFormatException" into ics
QualcommSharedRIL: Fix signalstrength on pre-ICS radio libraries

Change-Id: Id59e04a36a892657deb2dd76d8455a7bad8956fe
Long-press menu key to search, configurable per device

Patch Set 3: Changed config value on which this depends to store the presence
             of all hardware 'face' keys on a device as a bit field.

Change-Id: I3a24b148e21197cfbc46683557291956e44b5feb
Merge branch 'ics' of git://github.com/CyanogenMod/android_frameworks_base into ics
Uyghur translation for CMParts.
Put into production mode. Add some throw messages.
Merge branch 'jb-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp
card emulation patch port to JB

Change-Id: I86657f9c547840de33c35df4912b5f282d4fe459
Merge "card emulation patch port to JB" into jellybean
Merge github.com:SlimRoms/android_external_libnfc-nxp into jb
Update sample results.xml
Add short developers page.
HW2 release
Release
Renamed css class
Moved 'image' folder and data file under WEB-INF folder,
reworked ElementSearchList and RetrieveElementPeriodicTable classes
methods to address Professor's comments and make structure of program
more clear. Reworked PeriodicElementTest class
On GNU/Linux, realloc returns NULL if the size of
memory to be allocated is zero, return the existing
pointer in such cases.
Revert "Ported KGSL 1.1 [tkymgr][adridu59]"

This reverts commit 84e5d5291321a6e826a9bd978e8b4f65c15f9450.
add simple square cropping ability
removed attach/detach, and made sure NAs are not included in potential timeslices
semi-fluid bg image
new logo
fixed map shadow
content edits
Merge branch 'master' of git://github.com/aipd-wdim332/aipd-wdim332.github.com
content updates
social buttons
Merge pull request #7 from sean4500/master

Ready to go site
Update software/ms_sw/appl/motor_driver/SpaceVectorModulation.h

Added project definitions inclusion.
Add reference to mdpi-common resources

Change-Id: I08c3052370283aab96cb7f689a58fd9c94b07637
- initial
- initial 2
- SimpleBuilding DB
added gradeextract.o runprogram.pyc
add field_permission and create role: academic & professional staff
Deleted _posts/2012-04-11-test.md
Change the way, we get the token definition
july 4 recipe blog post
Added .settings and .DS-Store to gitignore.
Revert "Test Pages"

This reverts commit 9ff22d5c2e0c2f69935820253f4e8d1baf1cdc57.
POPL ICFP abbreviation
silly me, simplified example
renaming cell state back to cell
tweaked some changes per feedback
Site updated at 2012-08-05 08:08:23 UTC
Add instructions about maven 3 requirement.
Step 1 of Problem 4: Integers.IsPalindromic().

Nevermind the failing test for the main problem just yet.
Step 2 of Problem 4: Solve it!.

The greatest palindromic product of 2 3-digit numbers is 906609.
Post: No T.V party tonight
Editing Chapter4/readme
Merge branch 'master' of https://github.com/danielwind/EhCache-Effective-Caching
Updated VariableDeclarator element
sure it got a dead lock
Add second code block for now since one is invisible
Site updated at 2012-06-19 11:12:41 UTC
ganti font menjadi inconsolata
+ translate licensing descriptions into proper URLs
structured all the creasy stuff a little
Revert "Gesture performs only if performed on NavigationBar and if view is not modal."

This reverts commit 3fada438fc02ed9baf4501d7f304a742c39c16a3.
Site updated at 2012-03-11 13:06:39 UTC
Adding new layouts, adding editing of steps
Adding the edit steps screen
Removed the other implementation of adding a license in the controller extension.cfc, and removed the double nav that appeared on the license view page.
Merge remote branch 'origin/master' into develop
Added removeApplication functionality, and added some checks at addApplication function
Changed the controller Extension.cfc: grouped the functions, created helper functions to prevent double code.  Added the addJar backend functionality.
Removing jars now possible
Merge branch 'develop' of https://github.com/cybersonic/Railo-Extension-Builder-SDK into develop

Conflicts:
	controllers/extension.cfc
	views/extension/addjars.cfm
	views/extension/license.cfm
Moved the error/message box to layout default.cfm, so other sections can use these too
Added functionality to edit the ExtensionProvider.cfc info
Renamed action extension.addapplication to extension.addapplicationS, to make it compatible with the other Add options, and to fix a bug with the generic upload handling.
Added download button to extensions overview page
Adding the railo config file
Fixed issue on License page
Fixed image upload issue in extension edit page
Added Publish to Extension Store feature
Adding directory SDKdata, for storing extension store login details
Some last-minute text and layout changes for the Publish ext. page
Adding steps
Ignoring the bin directory
Added thumbnails to ATN categories to improve readability from distance
got sitemap to work
Add edited snd_soc_msm files, using UseCases
updated readme, text
Site updated at 2012-11-26 08:27:23 UTC
draw_square
Touchups, breaking up paragraphs, and "Ultimate Requirement"
allow db to be set on individual models
removed 'default' setting from database load
Merge pull request #38 from jrmadsen67/master

Allow db to be set dynamcially... thanks @jrmadsen67!
change the variable page to post

i didn't understand how this worked before but this makes more sense now
Version 2.0.0 Beta-Dev Initial Commit
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.1.1-50.50~ci~20120416003254 mx51 only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.4.1-3.3~ci~20120601002243 omap only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: CI: Start new release
linux-linaro 3.4.1-3.3~ci~20120728001853
        created from:
        tree:git://git.linaro.org/kernel/linux-linaro-tracking.git
        branch:linux-linaro_3.4-2012.05-1
        commit:6ba32bb59015878eff51c3aca1efae959bc2ae8f

packaged-kernel-branch-commit-hash=6ba32bb59015878eff51c3aca1efae959bc2ae8f
commit 6ba32bb59015878eff51c3aca1efae959bc2ae8f
Merge: 3f30472 774c3a2
Author: Andrey Konovalov <andrey.konovalov@linaro.org>
Date:   Tue May 22 20:39:37 2012 +0400

    Merge branch 'rebase-last-minute-fixes' into merge-linux-linaro

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.4.1-3.3~ci~20120527002119 omap only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Cleanup configs after removing other flavours

Signed-off-by: Linaro CI <john.rigby@linaro.org>
LINARO: Linaro-3.4.1-3.3~ci~20120929001738 u8500 only

Signed-off-by: Linaro CI <john.rigby@linaro.org>
Updated market
still working on the js for the slider. Having issues
optimized less compile with node and yui compressor
convert to main branch 1st step
nearlythere... honest
Fixed wrong github url
Added CNAME, it never build anyway, so better to redirect.
Adjusted option checkboxes positioning
update the varnish vcl template to handle MediaWiki:
1. the SERVER_PORT is used by MediaWiki, we have to fix it.
2. need add tailing slash if MediaWiki is install as a sub
   folder like /wiki
first commit: adding existing classes
Site updated at 2012-12-14 09:09:46 UTC
auto-20120329061701115008949
Octopress init
Site updated at 2012-10-24 14:53:03 UTC
Added more personalization informations
perpage 5
return if unauthorized
added final logo, for easy access to them
using subject, it, and its for rspec examples
removed useless default.prop
Added test & implementation for overall change
Changed from "rake/rdoctask" to "rdoc/task"
Update _posts/2012-08-23-Nuget-Upgrade-Button.html
updated path to yui libraries
updated README, so that the path to the XML is clear.
Fixes to widget.php - to support Moodle 1.9.x, 2.0.x & 2.1.x-2.2.x..

* Different versions of YUI for each
* Also credit in README.md
* Incremented version.php
Site updated at 2012-11-03 00:30:10 UTC
Detect if it's a meteor app, don't require package.json
updated travs yaml
add required tag
add docstrings for every memcached operarion
define default value for bucket parameter
fix package name in setup config
added width to LiveTV status panels
remove extra ,
cosmetic changes and comments
more renames to improve code readability
Merge pull request #3 from orefalo/master

cosmetic changes
Adjust console message format.
updated skycable.json file
Use COBRA_EXE environment variable to find location of compiler. Also, use project directory as working directory if possible.
temporarily removed cname
merge conflict
Don't use Armata.
attempting to deploy old site to gh pages
We now support ION
This is a test commit of my project in jquery
Merge branch 'master' of https://github.com/sriluyarlagadda/simple-app-in-nodejs
Site updated at 2012-06-27 17:41:47 UTC
Site updated at 2012-12-07 14:40:51 UTC
CSS v0.1
Added input filtering
Fix README
Tell vibetonz to be quiet

Signed-off-by: Max Fierke <max@maxfierke.com>
Fixed themes managing in headers
Updated to support vaadin 6.8.x
add json translation
CONTRIB-3962 - Cannot access list of questionnaires if there is a template questionnaire
CONTRIB-3954 - Questionnaire - no security checks before executing actions on 'report.php' page
Merge remote-tracking branch 'rlorenzo/CONTRIB-3962_22' into MOODLE_22_STABLE
CONTRIB-3841 - "Notice: Undefined variable: usersql" message when resetting a course with a questionnaire module
Merge branch 'MOODLE_22_STABLE' into MOODLE_22_BFC
Note that log_file attribute may not work
Path error to HTC file fixed
Fixed some classes pojos for the anotations JPA
TRIVIAL: remove useless image
README: Mention RecordBox and CPM
Added password validation to Users.
Localisation updates from http://translatewiki.net.

Change-Id: I0c8bf470de1989624ee39f11ca1f37c81cf5ac2a
Update M-Set viewer with new controls and colors.
d2: build modules only for samsung

Change-Id: Ice7f433124093b3e8079c09f67fc9f501e25bd42
Update notes for submitted changes

* Revert "d2-common: add nodelay support for a2dp" Using opensource hal now This reverts commit 5d101544c9ae2e539f3ab9bedaab45ccb23db22d
Rewrote the README.md file

The README.md file has been rewritten to provide a clearer explanation
of the features of the Asset Handler plugin and how it enhances Movable
Type.
msm8960: Update kgsl header

Signed-off-by: bmc08gt <bmc08gt.teamb00sted@gmail.com>
einige weitere Bugs behoben, weitere Spielfunktionen hinzugefügt, z.B. Spielende
removed xcuserstate files
Fix menu bug reported by sk8erwitskil:
https://github.com/CyanogenMod/android_bootable_recovery/commit/014d02059c8533f7e1b2ff3f1e8fdb5464098c59#commitcomment-2185643

Change-Id: I790bcc13cd8fe6bf2f0d8c0511f7d50b50873ac8
Remove wipe battery stats garbage.
Add support for doing a true ext4 format of /data on /data/media devices.

Change-Id: Ie6706989705e4cf90d0be119c7ffc54b2191d198
Fix regression in sdcard partitioning menu.
https://github.com/CyanogenMod/android_bootable_recovery/commit/1606b8a226ad6a2d7b2201f3e31b214322a56566

Change-Id: I110b7aee9274ddc58bc59a744d831f22e22e1336
Fix bug with sd card partitioning.

Change-Id: I84d1f641c7d493c268dcd26fceba863a042c490d
Merge remote-tracking branch 'github/jellybean' into mr1-staging
Update notes for submitted changes

* reboot applet cleanup
Update Simplified Chinese translations for Mms

Change-Id: I28909f0c61d5617bfc72c756fa824aa472137380
Merge "Update Simplified Chinese translations for Mms" into ics
MMS: French minor correction

Change-Id: I0dfba52e9c661787711a8bbc94fb11e757437a9c
Playing with things
More Tweaks
VICTORY: Fix for call audio.
verelo monitoring plugin, first commit
checking in tag listing plugin
oneseg: fix volume control, changel guide
felica: fix felicalock crash
junk: fallback font
Added BMLEngineServer to device-proprietary-files
Merge pull request #2 from sakuramilk/ics

Ics
vendor compiled assets
Second Commit
Fix submodule url so it does not request a password.
Merge branch 'submodule_url'
Merge branch 'master' of github.com:InsightSoftwareConsortium/ITKExamples
Added basic plugin files
remove double phrase
Add phrase
更新排序条件
更新排序
paginator的排序
将级联的comment提取出来的时候排序
在经销商的导航条上加入‘联系我们’菜单
加入联系我们页
联系我们页面第一次提交
联系我们的美化
联系我们有关的提交
联系我们的视图
添加关于销售分区的增该功能视图
added doctrine manager
BACKLOG-505: add database patches
update test to match new error message
Use over_http version of dep_selector
Merge branch 'over_http'
rename
rename gemspec file
ENV['TEMP'] for windows
Merge branch 'master' of github.com:RiotGames/knife_cookbook_dependencies
version bump
Windows compatibility fixes
version bump
Merge branch 'master' of github.com:RiotGames/knife_cookbook_dependencies
Setup Twitter Bootstrap theme
Wrap up multi stream
Update bcmdhd/firmware/bcm4330/device-bcm.mk
Lockscreen no longer has settings needing an update
Damn it, got another broken validation job. Hopefully this one will work.
added a couple more standard XDI data files
import a2dp audio policy settings from asus grouper
remove prebuilt audio files from proprietary file list
Added cluster spawner --expiremental
BoardConfig.mk: adjust device asserts

The "GT-P6200" form matches the ro.product.* property in stock ROMs, while
the "p6200" form matches CyanogenMod's ro.product.device property. We include
the first style to catch users who are flashing from stock, while the second
style will alternatively catch users who are already running CyanogenMod.

Since users running P6200 CyanogenMod builds will ALL be identified as p6200,
it's completely pointless to include "p6201", as that will NEVER match.
align mRNA matrix to methylation matrix
background color box variant
Merge branch 'master' of https://github.com/anthonyringoet/drupal-be-theme-sprint
Updated JSDocs to latest build
Removed docs for WebWorks-API-Docs-oncontextmenu from the repo
Removed docs for WebWorks-API-Docs-removeBeta from the repo
Updated JSDocs to latest build
Added entry to jobs.txt for  job
Updated root index page with new entry for job WebWorks-API-Docs-next-BB10-media-viewer-card
Some headers are symbols.
blueprint documentation
Added API key to config/constants.php
Drop affixes from cs:et-al.
Wrap one-line paragraphs; make headlines consistent.
Added Plone source file locations
Minor edit about jarn.mkrelease
sync (merge) with arut master (better record_interval fix)
Distributed Event Broker tutorial and transports added
Added distributed event broker scoping and identification
Added distributed event broker restrictions
traducido lucas 2:1-26
Fix: 'error: redefinition of ' errors
Add code to export import ULONG64 to 2 unsigned int

and back... !
adjust condition and fix getView
Add note about the repositories model that have to be updated
Fix from Mark
Fix from Mark
Merge branch 'feature/git-documentations'
Modified initial position and rotation of example 'symmetry', and activate by default the selfCollision (for this example only).
Modified initial position and rotation of example 'sample'.
Merge pull request #61 from DavidMansolino/Rotation

Fixed initial rotation
Added description for the example symmetry.
Added description for example sample.
Changed printf() for cout <<
Corrected small typo
Corrected typo issue.
Merge pull request #62 from DavidMansolino/Description

Added descriptions to the example
first try..,..
2nd try
Merge pull request #1 from frecon/diogo

trying out github
Activities for guilds and characters added
fix for the timing of calling RESInit() - fixes opera issue and sporadic chrome issues as well.
Merge pull request #89 from gavin19/master

Add 'cloud.steampowered.com' to inline image viewer.
switched to gevent queue for processing incoming processor invocations, live update of executions table
switched to gevent queue for processing incoming processor invocations, live update of executions table
HTML-339.  fixed SimpleDateFormat unparseable date error in PatientDetailSubmissionElement.  While I was in there, I added support for decimal ages.
HTML-341 Adding label tags around labels for radio and checkbox widgets.
Merge pull request #14 from sgithens/HTML-341

HTML-341 Adding label tags around labels for radio and checkbox widgets.
HTML-341 Fixing unit tests, which need to be updated now that some of the markup as a label tag around it.
Merge pull request #15 from sgithens/HTML-341-tests

HTML-341 Fixing unit tests, which need to be updated now that some of th...
HTML-342 When the tag is <br/> doStartTag will close the tag, and doEndTag will do nothing. Adding 2 unit tests.
added a couple explanatory comments
Merge remote-tracking branch 'origin/master'
HTML-337: Enable javascript id tag on the relationship tag
added a method to change relationship names to camelcase
Merge pull request #17 from rubailly/master

HTML-337 --added a method to convert relationship names to camelcase
HTML-193 Changing javascript popup to a regular link with a _blank target
Merge remote-tracking branch 'sgithens/HTML-193' into HTML-193
Icon is not displayed / Resource file is missing - HTML-151
[maven-release-plugin] prepare release 1.9.4
upgraded version # to 1.9.5-SNAPSHOT
No search results when searching to "Create new Relationship for
Patient" on HTML Form - HTML-350
generalizing autocomplete widget to work with locations
HTML-347 Adding numeric obs check in FormContext, so multiple numeric entries for a single concept can be removed for the obs pool when rendering a form.
corrected the code according to comments from commit1 and fixed the broken tests
XMLParser: appender-ref
XMLParser: writeAllXML() method
Updated .gitignore for all Visual Studio files
Initial Commit
modified config for heroku
added heroku oauth tokens
changed socket url
changed readme
Add product type mappings for iPad 4, iPad mini and iPods.
Merge pull request #2 from iosphere/new-device-ids

Add product type mappings for iPad 4, iPad mini and iPods.
Now recognizes .s4g too
Add MANIFEST and dist to ignores
Merge branch 'master' of github.com:jmagnusson/grappelli-modeltranslation
Removed other stuff in the .gitignore file
moved params to post; converted dl to table x2
Added .gitignore
update ramdisk
Proper max_axi_khz init
testedCourseCatalogFunctionality
Adds fancy micky mouse graphics :D
add test for asign of articles
ENH: Improving gtmroutines environment variable.
Updated to use apache name
DaysBetween now returns a full sentence
updated tests for DaysBetween
Remove the regular expression hack and add a cleaner utf8::decode to fix double byte corruption
Trying again the post-push procs
Updated version
Merge pull request #3 from patrickkivits/develop

Updated version
system: Update kernel/wifi/misc

Changes:
wireless: bcmdhd: import wow/pno_wakelock from bcm4330
wireless: bcmdhd: move wlan_gpio to MACH_SAMSUNG_VARIATION_TEGRA
wireless: bcmdhd: import RDWR_MACADDR and dhd_custom_sec from bcm4330
media: video: tegra: Set EMC rate to max when VDE is enabled
media: tegra: avp: Fix wrong cast of phys_addr_t
media: video: tegra: change emc clk operation sequence
media: video: tegra: set emc clk rate
media: video: tegra: reset sclk rate to min
media: video: tegra: Fix compiler warning
media: fix corner case in tegra_mediaserver
video: tegra: dsi: Config dsi and csi shared pad
video: tegra: dsi: Soft reset if dsi host busy
video: tegra: dc: protect dc extension disabling with a lock
video: tegra: dc: Schedule delayed work to clear emc bandwidth.
video: tegra: dc: acquire window locks in an order to avoid a deadlock
video: tegra: dc: Activate dc registers properly for one-shot mode.
video: tegra: dc: enable dc ext from underflow reset worker
video: tegra: dc: Ignore suspend if DSI is disabled
ARM: tegra: video: Flip window for unblanking
ARM: tegra: video: Support basic color scheme
video: tegra: hdmi: Enable HDA NULL sample inject support
video: tegra: dc: set mode on probe
video: tegra: dc: Call display client disable before dc irq disable
video:tegra:hdmi: skip useless check
drivers: video: tegra: Amend list of gr3d regs
video: tegra: host: enable_3d_scaling perms 0644
video: tegra: host: Fix timeout syncpt incrs
video: tegra: dsi: Refine the DSI clock calculation.
video: tegra: dc: Add dc backup clock source support
video: tegra: dc: enable emc clock on probe
video: tegra: dc: 1-shot bandwidth calculation
Revert "video: tegra: dc: fix DSI pclk calculation"
video: tegra: dc: consolidate underflow code
video: tegra: dc: Fix support for YUV422R
video: tegra: dsi: Fix mipi continuous clk disable
video: tegra: dc: use highest bandwidth setting
wireless: bcmdhd: move WLP2P to CFG80211
drivers: wireless: bcmdhd: clear pending interrupts before irq release
net: wireless: bcmdhd: Allow Improved suspend/resume processing on 2.6.39
net: wireless: bcmdhd: Always turn Off wlan power on interface down
net: wireless: bcmdhd: Add SETSUSPENDMODE command
net: wireless: bcmdhd: Minor cleaning
net: wireless: bcmdhd: Add SET_RANDOM_MAC_SOFTAP option
net: wireless: bcmdhd: Update to Version 5.90.195.30
net: wireless: bcmdhd: Update to Version 5.90.195.28

reference:
 video/media: nv-tegra.nvidia.com/linux-2.6.git
  (android-tegra-nv-3.1)
 wireless: bcmdhd: github.com/solarnz, github.com/kcrudup, nv-tegra (rel-14r7)

Change-Id: I01f73de3e68a41d010db4a92c8065432975003f5
category stuff
category stuff
Fixing problem with this/last_month graphing views for #402
replaced span with filter
Fixed edd_read_file() to work with large files
removing or Rails.env != 'production' from include_extjs
updates and bug fixe
Usage file created.
Merge branch 'master' of github.com:purple-led/AVR-Pulse-Width-Modulation
css loading issue fixed
Italian translation:
- newly added strings translated;
- some existing translations corrected.
Merge pull request #73 from Odysseus86/patch-2

Italian translation edited
Match 2012-06-13
initial timeline work
renamed some requests specs and added a develop projects spec
added the ability to confirm a story
added the ability to start a project
Merge branch 'development' of https://github.com/LordbyronIII/communal-workable into development
added the ability to deny a project
pushing latest changes to be able to work on the big screen! This is in the middle of passing the test of failing a story. You probably should not use this commit in any cases
pushing latest changes to be able to work on the big screen! This is in the middle of passing the test of failing a story. You probably should not use this commit in any cases
Merge branch 'development' of https://github.com/LordbyronIII/communal-workable into development
added the ability to fail a story
finishes a story
delivers story
complete a task
late night of coding! finished viewing of the user accounts
Creating a new account finished
fixed the rest of the failing tests'
can now edit an account
New Google Chrome update, font-weight now 300 from 400.

This has been done because the new webkit/chrome update now renders
fonts thicker when at 400. 300 used to look bad and too with webkit
font smoothing, but now it's thicker by default so we can change our
400 to 300!
initial commit.npm 0.0.0
Updated to know about progcode as the superclass of question types that can use this behaviour.
a muscle package
app/Controller/DashboardImportsController.php

inserted table sold avg
added controllerMerge branch 'master' of github.com:victor-anubavam/real-estate-dashboard

Conflicts:
	app/View/Layouts/default.ctp
Quase todas as animações da aplicação de exemplo funcionando
[AO] Some birthdays do not have year in them so it is better to use three digit date store
Merge pull request #3 from AntonOparin/master

Some birth dates do not have year in them
usage example added
Merge branch 'master' of https://github.com/vmelnik-ukraine/DoctrineEncryptBundle
Don't try to hide if the view is gone.
Updating readme, adding delete function