labofsahil/github-event-dataset-2012 huggingface dataset:
Google Checked in
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Merge branch 'master' of github.com:ndap/magento
Cleanup deleted files
Fixing sitemap issue
Addet missing phtml file for nasdaq feedpayment extension
FIxed authnet trnsactions url
Merge branch 'atwix_hotfix/authnet_request_uri' into atwix
span, div, table, figure are blockable.
Hide editor UI and remove carraige returns from text area.
Increase interval to predict death
Add link to nearfine.com
Read Me. Res.
General Tree is finished, graph has progressed. Commited to work on
desktop
..
Adds CC-BY license to footer.
Adds draft 'how-to' text for CHI Initiative.
Merge branch 'master' of https://github.com/praxisnetwork/praxisnetwork.github.com
Add a proper shebang
New post; switched to md by default.
Correction of problem when the standar deviation is less or equal than 0, modification of the forecasting method in general. Only takes the last n, values where n is the number of values that must be forecasted, under the assumption that last values must be of higher influence.
Merge branch 'trunk' of github.com:saaperezru/Meteorolog-a-AguasCalientes into trunk
Working QWidget with nothing in it
set render view and template properly for anonymous users in portlets.
uploading change log.
First commit of quickstart use-case for development mode, with only unauthenticated calls to third party api
Preparations for the presentation, fixing bugs, adding examples
Updated to RC1 of SignalR
Add publish task
Fix typo
Allow title change notifications after the document has loaded (issue #704).

git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk@812 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
Adding new MsSql connection (not finished yet)
Added a README for project Description
edits to footer links
Set correct values of ram, and localversion
add otg support,add flash script
add ntfs,fat support
update file format support
add overclock table
Fix mma7660 sensor
add battery fix(joaquimorg)
Slight style edit
Site updated at 2012-08-05 10:04:53 UTC
Turn off hardware acceleration to avoid crashes due to driver.

TODO: Turn this back on when driver bug is fixed.

Bug: 4883047
Change-Id: I8efb6d77035595650fff8acb8ddbd95a93fc711c
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
merge in ics-release history after reset to master
make toggle layout selection more user friendly

patch set 2: add image as summary to hint what the preference is about!

Change-Id: Ie5960d9e0815abbfc9732785d540047b891123e5
[romanbb]
Fixed gitignore to correctly ignore added repository after cloning into /appname
Version 2! It better now, see README (edit readme)
Addition of Choice module.
auth in popup with data sync
readding Résumé link
increased line-height
Index page_id

This might be needed for the next phase of development.

Change-Id: I19fffe854057355252e31ca176640ed077d05e20
working on new demos
re #74 restricted the end date for Create Curriculum Enrollment so
that it cannot be before the start date.
Update .gitignore to ignore some stuff in mkboot/
Oops
Merge branch 'ricer'
Add "buildzen.sh"
Add functionality to track messages.
Merge branch 'feature-manual-push' of github.com:AnyPresence/push_notification_extension into feature-manual-push
Removed unintended change.
architecture presenatation work
Began spec tests
Add trebuchet config.

Fixes icon layout on the launcher main screen.

Change-Id: I6d724e22c7c5a46634dcb3696c70e4dc5616817f
Update notes for submitted changes

* wl12xx: fmradio sync with freexperia repo
Update notes for submitted changes

* Add sysfs vibrator intensity controls
Update notes for submitted changes

* Phone: Simplified Chinese translations
Update notes for submitted changes

* Phone: Fix typo (Simplified Chinese)
Added camera_width and camera_height in the section Robot_config of the 'config.ini'.
Modified camera module to allowed differents resolutions (more resolutions will be added in the furtur).
Updated Robot::LoadINISettings to load the camera resolution from 'config.ini' in the Robot constructor.
Fixed small indentation issu.
Reseted camera resolution if resolution selected is not supported.
Merge pull request #58 from DavidMansolino/CameraSize

Allowed to modify camera size
Boot U Bitch

Change-Id: I098f6e2d76848ed71744bcaa0f2ef80c8f98f0f2
Update Assignment 2/main/JavaLAN.java
Adding resource linking for status
Adding school lookup by id
Removed QDC ingest form from content model
Merge pull request #3 from dwilcox/6.x

Removed QDC ingest form from content model
Fixed Build Error

Fixed build error when trying to convert from type "int" to type
"float" in audioinwrapper.cpp
Revert "Fix statusbar transparency"

This reverts commit e33e228f286cfe1433de05fe7372fbe4b76880f3

Change-Id: I8206e6cda6596f4d5cedb8c521d8af68625ca6fc
getEnvironmentState bugfix

Change-Id: Icc8e7193c4f1c5874f6386849e9e45078df5e099
add __future__ import
Updated _posts/roadmap/2012-08-01-router.md
Merge pull request #2 from SidneyAllen/master

add twilio example
Merge pull request #3 from SidneyAllen/master

Parameterized the to phone number and message
use latest custom code version
remove mob1 designation from URL
remove one-jar plugin from pom
merged conflicts
merge conflicts
popcorn slideshare plugin
unit test for popcorn slideshare plugin
Merge https://github.com/SocialCoding4Good/popcorn-js-slideshare
Merge branch 4.0.4

Change-Id: I9c305bd4ca5d7d6abffcee391ad0191afe2965df
Change name activity

Change-Id: I662d56cc02321b66aa2e2470cf2509c03d5bbe16
hardware/libhardware: Add APIs to support ICS LPA session

Change-Id: I0558cafacb25bfffefdfb1bd2afbf2a90f075a08
more generic catch for badly formatted equations
inital commit

starting compass project folders & files
executable files is not needable
Fixed liblights for Jellybean.
Compressed and optimized images
updated build help command
isAdmin Check fix for updating notes.
new navbox, toolbar, version, resource, help header graphics
comment refresh and check before subscribe to push
Update
Identify Sections as Groups with property of "sections_category".
Added group assignment grades.csv format handling which is slightly different.
Various updates.
Merge branch 'new_branch_name' into 2.7.x

Small changes.
Various updates.
make random mode random again
left overs, caused by source tree
Simplify quick pulldown summary logic and improve 'translatability'.

As word ordering on non-English languages does not necessarily match the
English word ordering, make quick pulldown summary more flexible. German
translation is included as an example for using the new functionality ;)

Change-Id: If92ab3d7a1ccc60022e79d22b5b8407bd8fb98ec
QuickSettings : Fix tile removal

Remove tiles if the device doesn't support that feature.

Change-Id: Ib50f7d91a0a8d6bf37aa3b5f8af843d3f14f0076
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
es_ES: Added and modified some translations

Solves new changes in 'quick pulldown summary'

Change-Id: Ied80943078e11884fe4cc8f645a68e32061214c8
One does not simply become a Developer

Change-Id: I64ab4d7ab9d8334275d2e4d493b716a8fc73ab4e
Merge "es_ES: Added and modified some translations" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
add high-end gfx option
update for fix a bug
Settings: Add ability to disable Power menu screenshot (Part 2/2)

Change-Id: I44f948bbd6b2b5c661f4fc6c765ea5308f266755

Conflicts:
	res/values/strings.xml
Ant minify
[x] change EventManager to no-singleton class
refactor job launch dialog...
port viwers to gxt3. refactor code
Merge branch 'gxt3-sandbox' of git@github.com:iPlantCollaborativeOpenSource/de-webapp into gxt3-sandbox
Port file viewers to gxt3. Refactor how viewers were launched.
Merge branch 'gxt3-sandbox' of git@github.com:iPlantCollaborativeOpenSource/de-webapp into gxt3-sandbox
remove unused classes and refactor code
deletion of readme file
disabling the auto configuration test

since auto config is currently also disabled
boundary updated
Another enhancement of OpenOnHelper
Don't start nagios monitoring if we aren't told to monitor anything.
More changes to nagios monitoring and basic config file.
Fix overlap with apache config and normalize some things.
Merge pull request #9 from galthaus/pull-req-release-essex-hack-master-4b021340b1

Remove duplicate apache directive for openstack-dashboard. Fixes initial deploy of dashboard. [1/4]
Changed how site is generated. Now using Hyde, my favorite python static site generator. Changed everything, so I just deleted existing site and replacing.
Content for manual
added overlay for themeManager

Change-Id: Ieb5af9c735be978ccc8acc91636997c75ec8032c
Merge branch 'ics' of github.com:nelo360/android_device_samsung_galaxys2 into ics
Change title to reflect repository name
osama's commit
- initial check-in for post-3: "marked orders"
Fake contingency tables.
using actuator prototype
Core 5.18
Changelog
Make explicit list of gem files
Move gem version inline
No rubyforge, come on
Other gemspec cleanup
Fix demo
Formatting
Bump version
Upgrading section in readme
Remove file also from manifest
learning less
changed Read me file with test data
Dep bump
[updatedness] Automatic version update for components-ness-jersey
Update base pom 19 -> 20
Dependency updates
Add configurable JaxRsJsonStreamer
Merge pull request #7 from stevenschlansker/jaxrs-streamer

Add configurable JaxRsJsonStreamer
Bust cyclic dependency on ness-server
[maven-release-plugin] prepare release ness-jersey-parent-1.2.0
[maven-release-plugin] prepare for next development iteration
Add license
[maven-release-plugin] prepare release ness-jersey-parent-1.2.0
[maven-release-plugin] prepare for next development iteration
Remove unused import
Attempt to skip deploying the testing repository, which no longer has any src/main
[maven-release-plugin] prepare release ness-jersey-parent-1.2.0
[maven-release-plugin] prepare for next development iteration
Move to 1.3.0
Add support for exception mapping through Jersey and HttpClient.
Retire old "jersey-server" code, there will be no more releases of this.
License
Merge pull request #8 from stevenschlansker/api-exception

API exceptions
Fix and add additional docs
Version 0.005
Add unit test environment

Closes #6
Added Sand simulation algorithm and sand coloration
Working merge of draw sand and the rounded cone figure
merge of make cone with rounded figure and the rest of my code with sand simulation
cleaning old code
Removed drawing helper functions
Removed compute cube normals
Removed real_rev, make_torus
Removed real_arbirary_rotation
Removed real_scaling
Removed reset_normals
Code Cleaned
package + procfile
More cleanup, minor fix for equivalent operators
turned errors red
Merge pull request #4 from joeyblake/master

Update Snippets/Table for Bootstrap 2.0
Localisation updates from http://translatewiki.net.

Change-Id: Ida80dc1031cadb67e0aac42ac8f8710bc80def54
Update Readme File with list of python files
Add hint for 4.4.3 toolchain to be used for kernel compilation
1.0.0.7.0.28, remove FGAM as doesn't work in distribution  mode(only replication mode), don't create distributed cache
if application is not distributable (web.xml element is not present), use StandardSession instead
1.0, added manifest file, use log framework instead of System.out
1.0.0.7.0.28, add manifest and version number
Twitter boostrap with HTML5 boilerplate & Sticky Footer
Merge branch 'master' of github.com:AdrianTeh/Ultimate-Bootstrap-Boilerplate
Updated Readme.md
Added redis-cli.
fixed some problems with the logical forms
fiiixxxx
Add our Torch and Usb overlay
added disableSelfhealing
Added Hello World QSG
Update guide/bootstrapping/bootstrapping_byon.textile
Update _includes/head_section_home.html

comment for jquery-ui-1.8.17.custom.css
Open uart before playing with power to TS controller.

Apparently opening uart enables some additional power sources needed by
TS so it actually starts to work in e.g. 3.x kernels (not a problem
in 2.6, but still a more proper way of sdoing things and
matches what WebOS does more closely too).
Merge "Open uart before playing with power to TS controller." into ics
Update notes for submitted changes

* n7100 dont share common gps blobs with i9300/n8xx
n7000: Update extract-files for AOSP charger, small whitespace cleanups

Change-Id: Ie29463d62177aca636637e600d90852ba6a39c0d
Enable Stylus gestures for n7100

Change-Id: I081132ad48493cf05b18c64c79c6921bc192cf6d
Update notes for submitted changes

* p51xx: use i2s interface
Camera: Touch Focus Duration Translations (Simplified Chinese/English)

Simplified Chinese translations for Touch Focus Duration as well as
to fix a mistake within the original English string file.

Patch Set 2: Removed untranslatable strings and improved description.

Change-Id: I8d8f07e0f3d237d6ba512d4cc36b294f7d95e5df
Update notes for submitted changes

* Revert "Revert "Camera : Powerkey shutter (2/2)""
update from json to point and contributor
expand querystring and ignore_expand flag
Color Tuning!!!! straight from CM
Fixed a bug for removing classe names

Also updated the addClassNames to be unique
Merge pull request #73 from dlundgren/master

Updated Twitter_Bootstrap_Form::_removeClassNames method
cleanup ramdisk
stupid typo
allow to use original cm adbd
fix overclock
do not backup moto ramdisk
disable mp3 hw codec, add more sw codecs
disable nosuid for system partition
Merge branch 'jb_2ndboot' of http://github.com/Quarx2k/android_device_moto_jordan-common into HEAD
Site updated at 2012-09-05 03:32:16 UTC
Update drivers/bluetooth/hci_uart.h
moved cart
전투 4
Battle Modify

배틀 제대로 된다 드디어……….결국 다뜯어고침
Site updated at 2012-12-18 08:22:10 UTC
Boot for toro
PowerWidgets: add torch

Conflicts:

	packages/SystemUI/AndroidManifest.xml
Revert "Added Virgin Mobile MMS Support, Fixed RIL For CDMA Phones Like The Motorola Triumph & Added A New RIL Class Similar To The Older LGEQualcommRIL..."
Would seriously prefer that you TEST BUILT ALL PUSHES TO FW AT THIS POINT IN TIME....1.4 release is imminent so experimental pushes to the main branch are not reccomended. Instead if you MUST push please push to an exp and then merge. TY.
This reverts commit 569159e892b037ddaa873ca27070bdb844addd2a.
- bugfixes
- first step for building in building
Omg fixes.
[maven-release-plugin] prepare release ness-httpclient-parent-1.3.0
Fixed web.config load issue with virtual paths
Merge pull request #2 from siimv/2a345613f915013836aedf0782cc33adeb88e1b6

I added a fix for always using IIS root web.config
spell-checked README
add escape button  and lose player
add random battle
Revert "Add patches for compiling"

This reverts commit 958423d79e3bb0dbb2bb503830842af7330d0dad.
Revert "Make devices sources mr1-staging compatible"

This reverts commit 4235e01beaf220e840a079383819fb6f3f4132d1.
Revert "Vendor CM patch and build fix"

This reverts commit dbb51a2b8515dca48e7b1d1050d6c38e92d83c31.
enable sec log feature (last_kmsg)
mach-u1: set correct start address for ramconsole
Added SGH-I777 files

Change-Id: I3d7ceaef218a3ed4b89a687381c2e561a56b08e4
Merge branch 'ics' of git://github.com/teamhacksung/android_kernel_samsung_smdk4210 into ics
enable sec log feature (last_kmsg)

Change-Id: I2d644ee7d21b27dc05beef36315ec32ae698bc9a
Removal of duplicate entries
updates for styles, README.md and screenshot
skins: Add 'Play Playlist' button into the context menu
2012-12-16-See-through-minds-Method-chapter.md
修改布局测试
Site updated at 2012-11-26 00:08:17 UTC
damit du mir nicht auf den sack gehst
Include additional template resources
fixed a typo in environment settings
White background?
Change proximity behaviour for devices with fixed keyboard

The actual behaviour of Phone (ignore proximity sensor and force screen to stay
on when the keyboard is opened) while correct for a slidding keyboard, is not
correct in the case of a device with a fixed opened keyboard, like the HTC Chacha.

With this patch, you can indicate in the overlay that the device has a fixed
keyboard. When done so, the state of the keyboard will be ignored, and the screen
will be turned on/off based on the proximity sensor.
InCallScreen: change orientation to nosensor

This allows the InCallScreen to show in landscape mode
on devices where it applies (like HTC Chacha)
packages/apps/Phone: squashed clean up of NetworkSettings from CAF

fixes: "Searching..." dialog that does not get dismissed if screen times out
fixes: crash when starting a new search before the old one has finished

packages/apps/Phone: Dismiss previous dialog before updating network list

After the network list is updated, the previous
"searching" dialog needs to be dismissed
even if the activity is paused.

Change-Id: I96aeccdd936b411e6077afb0abd288dd753e0582
CRs-Fixed: 319580

Fix crash in trying manual search again before first search completes

Manual network search query and responses are not synchronous.
This leads to multiple responses being processed consecutively.
A dialog is cleared on receiving the first response
and subsequent responses through exception when attempting to dismiss
the same dialog. Ignore the exception thrown by
dialogs as it is not benign.

Change-Id: Icc092b093af04ddfb15b2e5b30ac123577eab05c
Crs-Fixed: 326736
apps/Phone: Display Short Name/MCCMNC if Long Name is empty in manual search.

The operator name for each operator obtained in the Manual Network Search
should be derived as per 3GPP spec TS 22.101 A.3(Country/PLMN indication).
While deriving the name for current operator (already registered operator), as
per the spec if NITZ name has to be displayed, then some times the long name
can be empty in MM information. Since the operator information should be derived
from a single source, MM inforamtion cannot be combined with other sources
like ME DB information for long name. In such cases, Short Name or MCCMNC string
should be displayed in the Manual Network Selection.

Change-Id: I85f3cbd232fc4130084347aec9b4a8181b0fe896
phone settings: do not present duplicate operators to the user

filter out duplicates; use the operator numeric representation as the
criteria for finding duplicates since the numeric is what is actually
used when manually selecting an operator.

Change-Id: I71619a78d52d387bab938856ca6d0232105691cc
Merge remote-tracking branch 'upstream/ics' into ics
smba9701: media/video/tegra update from 3.1
Pulling EOD from Yahoo using YahooFinance-Typhoeus gem. Storing it in CSV format for each Stock with TimeStamp. Changed the migration files so that the values are float.
Pulling EOD from Yahoo using YahooFinance-Typhoeus gem. Storing it in CSV format for each Stock with TimeStamp. Changed the migration files so that the values are float. Removed the files from public/tmp folder.
mock release
Squish
Don't override BUILD_ID
implement Newton's method for rootfinding
pyramid: update defconfig for ci13xxx USB changes
new simple web design
First commit of Procesar_Logs_SSH
change due to new buildtool version
Fixed checklist images.
dodanie obrazków + update kodu aplikacji Android
게시글 수정 완료. 검색 최초페이지 완료. 페이징 예정
Added Abstract and Twitter, moved folders
schrank macht druck
Add missing argument in post method call
Restructure get and delete API call
working on splitting out the code that allows for remote Console API to work. aiming to land each part from the big patch
pretty much completed the HUDService-content.js and WebConsoleUtils.jsm files. started to apply changes to HUDService.jsm needed for async window.console API.
First commit. Working benchmarks
Site updated at 2012-08-18 11:29:13 UTC
Added IISToMonitis.ps1 with more options
plots and results added
Bumped up version of angular.js to 1.0.1
Added unit tests
delete typo endquote/period in quoted bash command
initial document, serious work in progress
not sure where the redundant header came from...
Forgot Multimarkdown is not supported. Whatever.
Small updates. Going to try this github pages thing …
Broke out specific resources from list. Would like to test 2 pages for GH Pages … latest content edits.
Merge remote-tracking branch 'origin/master' into gh-pages
added test nowa.md file
update dpram from FF18 source
added instagram redirect
link URL corrections
Site updated at 2012-09-01 06:31:34 UTC
rm non translated strings

possible fix MIUISystemUI.apk FC...
Merge pull request #14 from ingbrzy/patch-1

rm non translated strings
Remove duplicate message keys in aggregate groups

For translate messages for example, ext-0-all for listed
three times for each message.

Performance impacts are neglible, CDB message index size was
reduced by 106810 bytes which is 1.4% reduction in size.

Change-Id: Ibf705f2023bb91603672add146579c82e7789d9a
Merge "Remove duplicate message keys in aggregate groups"
Use links for issues
Correctively added README.md
Testing done
Merge branch 'master' of github.com:BieberFever/TaskManagerGroupCommunication
replace  print frame with print approximate game time

also redid some text
Merge "Self-extractors for IML74K" into ics
Update notes for submitted changes

* Restore voodoo sysfs filename
rename browserType to browserFamilies
add BrowserVersion report
add OperatingSystemFamily reports
add MobileVsDesktop report
add EntryPageUrls and ExitPageUrls reports
add EntryPageTitles and ExitPageTitles reports
-
add reports
use GeoIP report first and if it's not available use default country
report
test if piwik version > 1.8
if not remove unsupported reports
new version 1.6.1
update country title
update version
Refactoring, to make things work wrt databind issue #69
update Camera overlay
Fix bug #1075:  Main language switcher wasn't working on project sheet, because the slugs can be different between languages.  The project_sheet_show now looks for slugs in all languages before giving up.
Fix #900, middleware order was incorrect
Middleware reordering broke some pages, including the home page.  Move Locale and CommonMiddleware fater Dynamicsites.
Merge branch 'master' into release/o-nine
Update apps/project_sheet/templates/project_sheet/obsolete/projects_for_tag.html

Just added "/obsolete/" 
Merge remote-tracking branch 'simon/master' into hotfix/projectag
Merge branch 'hotfix/projectag'
Fixing unit tests for protein generator
New Lockscreens BlackBerry and Optimus 4x 2/2(Credit to the Slim
Team)

    Multidpi lockscreens based on evilistos idea

    - add ability to use BlackBerry styled lockscreen
    - add ability to use Optimus 4x styled lockscreen
    - ass settings shows on choosen lockscreen customized Lockscreensettings
    - add ability to set transparent lockscreen
    - code cleanup
    - and a lot other small stuff

Change-Id: I2dfa75be9aa0890dadb3f1b3b858eea05f9df2e8

Conflicts:
	res/values/strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cnd/LockscreenInterface.java
Changes standard transparent....

Lockscreen to disabled

Change-Id: I1b4262d4ce48cd19730c91553ff56f32d0267650
Gives ability to set security.....

lockscreen settings to ass

and fix for non sticking aligment/color on different
lockscreens then stock

Change-Id: I2fe2f5ad6181e5cedd9e5376730ef06df384d88a
Lockscreen fixes and features Part 2/2 settings(Credit to the Slim Team)

- change to using integrated instances now
- several fixes for music transport controlls
- BB tablet support
- better peformance optimus lockscreen on hdpi devices
- lockscreen background transparency moved to background customization and works on the fly now
- lockscreen background 0-100% alpha can be activated on colorfill and custom background
- clock moved in settings to widget behaviour. Style could be customized now + hidden feature
- if clock is hidden status1 and owner info will be centered automatically
- owner info can be shown on lockscreen
- optimus and BB lockscreen can now be colored and alpha as you like
- optimus background settings deleted cause of stock background customization ability
- ability to choose one of the custom lockscreen before secure lockscreens
- vibration support for optimus and BB
- whole lockscreen settings are working dynamically now and show just what is possible to customize
- code clean up
- png clean up
- a lot small stuff

PatchSet 2 + 3

- cleanup whitespace errors

PatchSet 4

- commit update

PatchSet 5

- fix FC on custom targets in settings

PatchSet 6

- fix glitch of alpha slider lockscreen background
- some tabs cleanup on old files

PatchSet 7
- also set background for circle screen to a nicer one if default was standard (worked till now only on lockbeforeunlock)
- a bit cosmetic and final one

Change-Id: If4618dab8770afb12f279d45f4759b0b62c42da5

Conflicts:
	res/values/strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cnd/LockscreenInterface.java
Forgot to push this files
move lcd setting into specific device tree
Putting version numbers back
Merge branch 'master' into onebusaway-nyc-app-mods-merge

Conflicts:
	onebusaway-webapp/pom.xml
	pom.xml
updated updated app js files to move dependency call from  function to
made require resolution non relative, group codes between from lib and app, clarified comment on injecting param to View
Add audio policy

Change-Id: I3c9e86cdfe2c96e7b49c2cf81e4d2f15fcf40d1f
Remove some excessive sudo's
Revert "Cosmetic adjustment to README"

This reverts commit 6dc21c05aa7d0e243e65a254e77e3db91702a1fd.
Revert "Add SQL CREATE statement to README"

This reverts commit b44e66b534df152befb23b072f03e5410c0be73c.
INTSCALA-24 polishing aggregator
Solved some strings warnings

Change-Id: I5439867192892d8947b5102007bddb777ced02c2
Update Classes/TaskCollection.java
Readme update, V11 folder, Search Programs tab repurpose
Included a unit test run command in the interpreter.
cleanup
added xml form hooks
Merge pull request #28 from DannyJoris/7.x

7.x
Merge branch '7.x'
update 2.3 .png files and fix some sentences

updates 2.3.inti.png
fix words/ sentences in 2.2 and 2.3
Merge pull request #68 from wenlei/master

updates the images for chapter 2.3 and some words modification.
Added a troubleshooting note on reaching the limit on the number of VM instances
Moved configrc.default to config/configrc
Renamed: moved source configrc and mysql to the beginning
modified version of core security packet sniffer
changed url for DoL
Updated config/items.php
Updated config/items.php
Updated config/items.php
Updated config/items.php
Updated config/items.php
Updated config/items.php
Update config/items.php
Merge remote branch 'upstream/master'
Fix the crash when choosing pick your video in effects recording.

In pick your video case, mEffectType is not EFFECTS_NONE and
mEffectsRecorder is null in onPause.

bug:6826528

Change-Id: Id8c933555b1b8a37c541deb04746468efe1787c0
merge in jb-release history after reset to jb-dev
Fix the crash when choosing pick your video in effects recording.

In pick your video case, mEffectType is not EFFECTS_NONE and
mEffectsRecorder is null in onPause.

bug:6826528

Change-Id: Id8c933555b1b8a37c541deb04746468efe1787c0
Reconcile AOSP and GOOG jb-release

Change-Id: I4cc25b61eec4fd2e087dae2e11f12cbb659891a3
Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Camera into aosp
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Camera into jb-devel
Putting edit links on right of blocks they belong to

[#39101279]
Overhauls editable_area to open in edit mode

[#39101279] If the editable_field is empty, it opens in edit mode rather than waiting for a user click.
update criteria ngv report
12.1 ในประกัน Vendor install
12.2 นอกประกัน Vendor install
Update site/sv-SE.com_hwdmediashare.ini
now there are 5 sections and one can decide the size of each.
Merge pull request #4 from davidedc/gh-pages

updating master
updated readme to reflect addMultipleItems addition to the head block
EXT JS README update
Juste je teste que ca marche :D
a
a
test
test2
Merge pull request #1 from afgutierrez230/master

Please Give me a pull !
Added in wsimons HDMI code
Korean translatinos : Profiles

"soundtone_summary" and "volume_override_summary" has not sufficient text.
msm8660-common: also copy bcm4330.hcd
msm8660-common: use custom liblights for front pad
Merge remote-tracking branch 'htcmsm/jellybean' into jellybean
Update README.md

Added a small demo.
Fixed CSV serialization and added improvements to the editor program
fixes #39 - Fixed Radio and MultiCheckbox elements so that they do not get rendered with \<br /\> tags as the separator.
Fixed file elements getting their decorators overridden. Issue #35 is no longer fixed because of this.
Fixes #27 - File dialogs will now only show up once.
Merge pull request #40 from lrobert/master

Fixed the issue with Radio and MultiCheckboxes
Merge branch 'master' of https://github.com/Emagister/zend-form-decorators-bootstrap
Fixed Zend Form's createElement, but this should be done in the framework in the end.
Merge pull request #41 from lrobert/master

Temporary Zend Form Fix
Merge branch 'master' of https://github.com/Emagister/zend-form-decorators-bootstrap
Bug fix in the class attibute of the helper FormUneditableTextfield
Removed code
herokuized
Started the JIDM template.
Store URL of XML files in database

fixes #12
adding bootstrap and playing with css
Merge branch 'master' of github.com:mecathcart/Drag-and-Drop-FieldLinguistics
css and adding button
Merge branch 'master' of github.com:mecathcart/Drag-and-Drop-FieldLinguistics
updated chrome  extension and played with css and SKINSgit status -s
Changes to the static prototypes
remove dirt
Merge remote-tracking branch 'origin/master'
fix recovery with ics gadget support
init: prepare to switch to ASUS's TF101 ICS libs/fw

Change-Id: I9a58eaab587a50cf7fd819870e977ee6685c918d
bootanim: set BOARD_CACHE_BOOTANIM

-dependant on:
 http://review.cyanogenmod.com/#change,13665

Change-Id: Ia19894d6b1fd6e33a5aec0a407d4810b61e311ee
network: change to in-build broadcom bundled FW for STA/AP/P2P

-AP: reference isimobile (in-use testing)

-Note:
 Currently, P2P requires the wifi module to be in-built.
 This breaks Wifi Tether, so leaving it off in the overlay for now,
 while it is investigated.

Change-Id: Ib6b7a34582c7d11beac77dc937fa055082057951
hdmi/cameradata: move files to device tree(s)
FIX - IM display smilies for chatbox
FIX - first export than show.
FIX - search user posts
new site config for Fox.com
Fox - crop annoying/useless progress bar
Merge pull request #22 from mikedm139/master

Fox - new site config
Clean up project.clj, use "-XX:+UseConcMarkSweepGC"
Swap to Clojure 1.4.0 by default, add profile for 1.5-alpha3
Housekeeping
Large overhaul, incl. switch to autobench (httperf)
Bump version (major)
Merge branch 'dev'
change glyphons sprite path for twitter bootstrap plugin version 2.1.1
Merge pull request #21 from troii/master

fixed glyphicons path for bootstrap plugin 2.1.1
regression fix for hierarchical destruction(was broken)
partial fix for ground impact destruction
1) Removed the unuseful Exception package with one class
Removed doctrine inheritance
remove modem partition from fstab
welcome to the disasterzone
updated the guard file to look for the source files in the right place
Node server no longer routes to dashboard/dashboard.html
Localisation updates from http://translatewiki.net.

Change-Id: Id84f1a93942b59ae710ff85f0ad55071c5adaeac
Updated the README file to include the proper instructions.
change in getting local IP for Android ICS
Registration page nearly complete
Add CmCircleBattery to StatusBar options (2/2)
Cyanogenmod Circle Battery implementation (credit Sven Dawitz)
https://github.com/CyanogenMod/android_packages_apps_Settings/commit/bc733600b3093c5e9c432c418f2eda0cc5ef0e55
Update included packages

Change-Id: I2475b38594263ef1654864e946b1f9e13eea1d9c
fixed rotation on rigidbodies, still doesn't colide
ladder functionality
Update galaxyr.mk

Fixed wrong directory for device permissions.
Bumping version back down to 0.9 because of retarded version comparison in CRM_Core_Extensions::getExtensions() or whatever it is.

CRM-10378 - http://issues.civicrm.org/jira/browse/CRM-10378
adding piwick and login_destination modules
Turkish Translations update for Browser

Change-Id: I09ad5b6107129c9b3c4ba1df63447a7452d20334
Signed-off-by: Faatih Erdem <fatiherdem@outlook.com>
(censored) constants
Merge branch 'master' of github.com:LuminosoInsight/luminoso-api-client-python
Implementing auto-login request retries
Added test for crushing pipeline when dependency fails
pep8 cleanup (for my own sanity)
Remove previous request auth fields and hooks before calculating auth on retry
For debugging, indicate whether or not the auth request is willing to retry
The effective LuminosoAuth object now forces the cookie header in the request, so as not to inherit old cookies from a failed request
Trimming back on cookie-related debugging messages
Exposing auto-login as a feautre in LuminosoClient, disabled by default
Merge remote-tracking branch 'origin/auto-login' into auto-login
Merge branch 'auto-login'

Conflicts:
	test.py
Dodałem moduł rejestracji + pełna obsługa. Zamieniłem aplety na
okienka, ale muszę je naprawić albo nawet zrobić od nowa, bo coś nie
chcą dobrze banglać.
Added permalink icons.
Updating for style feedback.
grouper:  Add browser overlay for tablets

	Screenshot:  https://www.dropbox.com/s/qx4ckgjbw55zp59/Screenshot_2012-09-13-13-44-15.png

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Adjust scripts per new binaries for Android 4.1.1 (JRO03R)

Change-Id: Iaecc030e0c056d276dcbb144eae2e3045de6ba70
Merge "Adjust scripts per new binaries for Android 4.1.1 (JRO03R)" into jellybean
grouper: Add libdumpstate.grouper

Add libdumpstate.grouper, which gets statically linked into dumpstate
to dump grouper-specific debugging information.

Bug 6851316.

Change-Id: Ifa742a98d7aa95c2e0421111b6fc60ff2517ac4e
Signed-off-by: paris_yeh <paris_yeh@asus.com>
auto-generated blob list

Bug: 4295425
Change-Id: Ie1f2f091ecf27ca066f101f451f201c2a34c1817
Follow the established pattern for the vendor/ entry points.

That way, scripts that expect that pattern don't get confused.

Bug: 6931494
Change-Id: I121e013af42fa8ee64f56dcacc81e17a945e01af

Conflicts:

	BoardConfig.mk
	device.mk
Move grouper specific vars into BoardConfig.

Change-Id: Ia90386f027c43abd80d67d443c77a156513fd382

Conflicts:

	BoardConfigCommon.mk
Add "discard" mount option for data and cache partition.

Change-Id: I6bf4a1a81108d80f2fd70476484815d19ebacc95
bootloader: nakasi: subject bootloader version to 3.41. DO NOT MERGE

What's new in this release?
    1. add new hw version, ER4, ER5 for TI PMIC sku
    2. fix TI PMIC power off fail in BL stage
    3. set eMMC Vcore to 3.0V in BL stage
    4. shutdown the device immediately when remove usb cable
       in off mode charging

Change-Id: I3dfc58c9ab358450db17e7de14b87f84866823c9

Conflicts:

	board-info.txt
Update fingerprint to JZO54K

Change-Id: I52c2fec13d9f55a49ed095d8d41cfac316402a64
Adjust scripts per new nfc binary for Android 4.1.2 (JZO54K)

Change-Id: I02bae81aeadac215098705bd45e28b26890c490c
Removal of keystore.grouper for Android 4.1.2 (JZO54K)

Change-Id: I3d1789b5e16c04b7de68c82f03c2c5327a2535b7
Provisionized!
Missing DLLs
bug 1sek warten nach ende gefixt, update statistics, stepFinalWay
Fix compiling
Another fix
Merge pull request #261 from Y0ba/master

Исправления для компиляции
Change row-meter color
Add an option to change the device hostname (2/2).
This adds an option to modify the device hostname used
in ip resolution. This is useful when connecting to the
android device in a dynamic dhcp environment.
Ad-hoc network support (settings part)

Based on GB patch by havlenapetr

Change-Id: Icb59e817d346dfc0e93a254ffafa9761fa47ec0c

Conflicts:

	res/values/config.xml
	res/values/strings.xml
Change-Id: Ia0250c58659de3d1a8fc022bc89022a2d74c1933
I messed up, fixing my mistakes
Site updated at 2012-10-13 06:06:13 UTC
Added support for reading XML files
added a new core words main menu option

couple of bug fixes to parser
new menu item, some parser bugs fixed.
Merge branch 'master' of ssh://github.com/admachina/AwesomestTeam-Communication-Aids
Merge branch 'master' of github.com:admachina/AwesomestTeam-Communication-Aids

Conflicts:
	iOSCode/Communication_Aid/Classes/Communication_AidAppDelegate.m
	iOSCode/Communication_Aid/Communication_Aid.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:admachina/AwesomestTeam-Communication-Aids
Updating treeview docs
more bytes...
Extracted the definition of the internal DSL from the step definition
common httperf configurtion
modefiy pcsdemonote
fixing height for smaller viewports, adding viewport meta tag
Took out " " around my getReady : true property. Put a ; after my global variable timeLeftToWait =0;
Added assertion to check that splashscreen property is actually set
fixing depreciated parts of code
cname: remove www subdomain
Added page about Scratch.
include: update headers. these all need cleaning
msm8660-common: update headers from HTC 3.0.16 kernel

Update audio and camera headers from HTC 3.0.16 kernel source release.
Header from htc kernel.
Add required attribute.
Firmware from leak.
Copy configs to device.
Updates for omx merge and new kernel.
camera need surfaceflinger
Refactored src_path to be method of parent class DocsplitProcessor.
Removing Rails.logger as Rails is not a declared dependency.
Initial DocsplitImage spec.
Fixed similar call to Paperclip:Error as a4a310cdaa .
Testing for exception on failure to process Docsplit.image.
Hooks for docsplit_image spec.
Added missing method to CustomerCtrl and fixed build error
Unittest for error-from-script
Fixed error handling in the parsing thread
SC-06D不具合対応及びSC-05D、SC-06Dの直接呼出し対応
新方式、SC-06D用「直接197328640呼出し Type01」を追加
新方式、SC-03D、SC-05D用「直接2263呼出し Type01」を追加
新方式追加に伴い、アプリの要求パーミッション追加
新方式追加に伴い、お勧め呼び出し方式を変更、説明文の大幅変更
Update WebInterface/install.php

Few errors corrected.
Port entry added.
fixed a typo interfering with proper uninstall
Now made it so that the input text is checked against saved passwords
updated offline caching
Add pagination
Add new method for flickr
Add flickr liquid thing
Adding akela-0.4 snapshot
Changed style of Show, Edit and Remove buttons.
fix some of the stylesheets for mobile
Merge remote-tracking branch 'origin/master'
change logo and stylings for mobile devices
releasing new version 1.6-ALPHA-5.1-kti
launch image ead
removed unused require and console.log
v0.1 of formtimer
「明細書」のWebsocketでの変更にjsonを使う方法を模索中
Catching NoClassDefFoundError
change build sh
ashmem: Implement read(2) in ashmem driver
ashmem: Fix ASHMEM_SET_PROT_MASK.
ashmem: Support lseek(2) in ashmem driver
ashmem: Fix the build failure when OUTER_CACHE is enabled
ashmem: Fix ashmem vm range comparison to stop roll-over
disable GENTLE FAIR SLEEPERS
Sleeper Fairness is a concept used by CFS which treat sleeping/waiting tasks as if they were in a run queue. This implies tasks which spend most of the time waiting for an user input and such will get a fair share of CPU when they need it. Disabling Gentle Fair Sleepers could improve UI responsiveness.
base: genlock: handle error while creating lock/handle inode
base: genlock: add magic to protect attach from non-genlock file
base: genlock: protect kref counting with spinlock
Staging: android: binder: Add some missing binder_stat_br calls
Cached thread return errors, death notifications and new looper
requests were not included in the stats.

Change-Id: Iabe14b351b662d3f63009ecb3900f92fc3d72cc4
Signed-off-by: Arve Hjønnevåg <arve@android.com>
tweaks iosched for better android performance
remove the compile warnings
Merge branch 'ics_HWA' into jellybean
msm: kgsl: Find a mem_entry by way of a GPU address and a pagetable base
Given a pagetable base and a GPU address, find the struct kgsl_mem_entry
that matches the object.  Move this functionality out from inside another
function and promote it to top level so it can be used by upcoming
functionality.
Limit cats eyes on homepage to 6
Took notes on why we should expect dot renaming to work,\nand on the relative merits of different ways of representing its success (zdiff\nvs other options).
started work on oct. 2012 lab meeting presentation powerpoint
Change locale to english

Signed-off-by: Johannes Seitz <software@printhelloworld.de>
Social Auth Twitter integrated

Signed-off-by: Johannes Seitz <software@printhelloworld.de>
Refactor js into a Sugarman class
Added in RFM12B test code and changed from LiquidCrystal library to JeeLib
Remove ugly hack module
http://wireless.kernel.org/en/users/Drivers/wl12xx
Fix camera flash
clean up
Merge branch 'cm9' of github.com:CM9-D2G/android_device_motorola_droid2we into ics

Conflicts:
	prebuilt/etc/hijack-boot.zip
	prebuilt/etc/hijack-boot/newboot/init.mapphone_cdma.rc
Removed random sleep from ObfuscatingComparer
fixed <orth> element for entry αἰών
added comment to shell script
	modified:   generateabbottsmith.sh
Merge branch 'master' of https://github.com/translatable-exegetical-tools/Abbott-Smith
Checking in Source
Merge branch 'master' of https://github.com/yohanliyanage/blog-mongo-integration-tests
Removed .gitignore out side of project
Cleanup mess made doing pointless merge
pmemalloc: use absolute android_pmem header path
kernel: 3.0.27, voltage control iface

Change-Id: I74ad411c9fce24901efa0c9d2d82fc7385c2ada5
Update notes for submitted changes

* hercules: Fix product string
Revert "hercules: enable overlay to fix camera preview"

Change-Id: If4088d4ed2311b11153975e35de329d852f6c36d
blue: permission for Sony CALD to set/get property variable

Change-Id: Ie60aec8975382071d5014c0085c54074824a4597
Add new French translation and correction
Update notes for submitted changes

* Hotseat: Lanscape layout fixes
fixed loadFile()
Missing 2G Toggle Override

Change-Id: Iad2c1c7787052a6eb6f5980e0e9b7cd1d17db428
add sw600dp drawables to prevent crash on tablets with phone functionality

needed to get Phone app working on p1

Change-Id: I635baa045583b373536907d92efa118819c8b07d
Mass updates

* add original Rev 1.15 xml

* Better CSS

* Hard translating work is still in progress

JuanitoFatas @ Taipei 1:27 2/11/2012
Put pvrsrvinit in the right place so it's started at boot

Change-Id: Ic73aab0fba2b39acd9c6d1b8b65fd225993b7c17
Add phone ver and such
fix finalize release
update output filename

Change-Id: I048cd3a6eeb01202c59533d8a4a8b2f8d99f807d
Contacts: Fix broken export-to-storage function

The contacts exporter relied on a device configuration option that
was hardwired to the older storage path format. Instead of updating
the path, replace its usage with Environment.getExternalStorageDirectory,
which is consistent with how the importer does it.

Change-Id: Icbd06072ddfc3f30c7caffbbfccbcf9df0f0d9b3
Merge "Contacts: Fix broken export-to-storage function" into jellybean
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Contacts into jellybean
initial password recover dialog for site
next
next
Merge branch 'master' of https://github.com/SebastianBaltesObjectCode/AppTemplatePublic
Added WebPlayer compatibility for threading libraries
Merge pull request #7 from jcmontoute/master

Fixed threading libraries
EventHelper bugfixes
[README]改善使用方式
Added Alerts.html
Alerts info template now shows attributes as a <dl>.
CamelCase attribute names are now split in info window.
Added functions for splitting camel- and pascal-case words.
Use conditionals in local libs

This makes sure we don't conflict with libs provided by other
devices during build.
Manually deleted non milestone2 files
[ARQ-804] Introduced @CleanupUsingScript annotation to provide a way to clean database using custom script instead of DBUnit.
1) Renamed plotConfidence into plotAccuracy and made it into a function
2) Wrote the Usage section
Changed "deviceready" to "webworksready" for webworks.js and functional test runner
Merge pull request #15 from blackberry-webworks/next-rename-deviceready

Pull Req: Rename deviceready to webworksready
Update webplatform to fix dialog translations
Cleaned up stuff
Cleaned up stuff
Add unit tests
Add fields "counter" and "empty"
Se termino la eliminacion de archivos tirados a granel
msm8960-common: specify target arch

Change-Id: I5f2a014d16416788ae376e30214e2846dee1889f
keep resources in the MANIFEST
修复`
allow connection_string in the database.yml.

Fix binding of nils. (nil Integers were being saved as 0).

Attempt to fix problem with aggregate calculations on groups.
Frenet Frame Implemented with Cross-sections. Code is a MESS, but progress none the less. Next I need to rotate cross sections to avoid twists. Though first we'll try skinning some refactoring.
to release 0.03
to release 0.04
Added disqus universal code in post.html layout page.
Add missing cmake submodule.
Change to IRealTimeSensor to be an interface
- Explain api. Work in  progress.
META-293: Rename ConceptPubSub to MetadataMapping
Restore lockscreen setting

Change-Id: Icd0e4b9bb8f06d1d133534b0900ec7a39e4504c7
Replace Perinci::Sub::property::result_postfilter with Data::Clean::JSON
filter players with 0%
Update to RTM Nuget package
Rename and cleanup ve.ce.Surface locking state

Get rid of ve.ce.Surface.locked (and isLocked, lock, unlock) and instead introduce ve.ce.Surface.renderingEnabled (and isRenderingEnabled, enableRendering, disableRendering) which names are way less confusing and more specific. Also add use of isRenderingEnabled to ve.ce.ContentBranchNode.

Change-Id: I72e9e8f8dfbf43784d7e616369acc3e9649c715a
Merge "Rename and cleanup ve.ce.Surface locking state"
complete list of urls, added some views
fix bcmdhd firmware paths
d2: consolidate ril blobs

Change-Id: I587bee466a3c1599b7f0b4a6efe7f79fa4d15283
Merge "d2: consolidate ril blobs" into cm-10.1
skyrocket: removed gpsone from init scripts

It wasn't started anyone on this device.

Change-Id: I83a7bb041058c31551b645373a20381c05c8480c
Closes #1, don't know why it conflicted.
PLFM-1427 Migrator is not handling changed etags properly for User Profiles and Access Requirements
Merge pull request #70 from eric-wu/develop

You've added the necessary updateFromBackup() to AccessRequirementDAO, AccessApprovalDAO, and UserProfileDAO. Updated the drivers (PrincipalBackupDriver and AccessRequirementBackupDriver) to use them. And added the associated tests. Nice work.
Fixes for branch support
Texture meta file update
Browser updates no longer happen when the gui is disabled (this was causing a Win32Exception)
Additional icons for CM Device Settings

Change-Id: Icc179c904d3b09b7224027802e0db7c46d36edfc
Launcher: Don't remove pending add info with shortcut pick

Change-Id: I74752af9250ccbcdb0f08f75f3ae2470fa354f5b
Merge remote branch 'cm/cm-10.1' into cm-10.1
[TIMOB-10846]Changing the youtube video link for iOS 6 
[TIMOB-10846]UPDATE KS FOR THE NEW YOUTUBE LINKS
Merge pull request #35 from srahim/timob-10846

[TIMOB-10846]Changing the youtube video link for iOS 6
Update some misc
Fixed tag handler implementation
Updated to reflect the changes between adoptive and actual name
Update CNAME

Removing the domain name until the DNS has updated
Revert "Revert "aries-common: remove unnecessary wifi-direct/p2p stuff""

This reverts commit de2bdca8f945de8e8881ab8e7b17c8510d3ed005.
Cleaned up html files
Prepare for next release
Fix groupId
Add scm url
[maven-release-plugin] prepare release parameterized-trigger-2.17-h-1
[maven-release-plugin] prepare for next development iteration
Merge pull request #2 from christ66/master

Prepared for release.
CORE-3203: added an endpoint to remove collaborators
changed manifest to allow for spare parts
added sleep time
added sleep time
subpage added
fixed doc - gnarf