labofsahil/github-event-dataset-2012 huggingface dataset:
Add basic support for conversion to EPUB.
Correct namespace on MARINTEK specific Ant tasks.
Rename markup language to "ExtendedConfluenceLanguage"

This is done in order to separate it from "ConfluenceLanguage" which
is contributed by Mylyn WikiText.
Correct namespace on MARINTEK specific package.
Remove duplicate code. Proper reuse Mylyn implementation.
Code clean up. Fix hyperlink generator.
Handle "mp4" videos.
rm page.html
SQL solutions by Aristotle Pagaltzis
moved config into includes folder, and renamed classes folder to includes
Fixing a memoryleak
add explanation about menu path.
Use bcm4329 firmware from AOSP

patchset 2: remove firmware blobs

Change-Id: Ia9e4cddafc17ed976bd47a12858a8ae591ff66a0
p5: Sync with pershoots latest changes to the p4/p4wifi ports.

References:
http://review.cyanogenmod.com/#/c/18186/
http://review.cyanogenmod.com/#/c/18187/
http://review.cyanogenmod.com/#/c/18192/
http://review.cyanogenmod.com/#/c/18193/

Change-Id: I725bf6807af9b530d86a7373f02f3fbc280d8f31
Mms: Add new feature 'Add SMS to Calendar remind'.

     I always receive the SMS from my bank. It to tell me how many money need I repay for my credit card.
     But I always forget it or other import SMS I will forget. So I add such feature to put the SMS content to Calendar to notice me.

     Snapshot
     https://docs.google.com/open?id=0B7x96l8QY1apZ1psVURoZW93RTA
     https://docs.google.com/open?id=0B7x96l8QY1apalBZZnpEc2hPVlU

     Patch Set 3:
         Add the lost menu item process funciton.

     Patch Set 4:
         Remove unnecessary white space.

     Patch Set 5:
         Use final static string to instead of the dynamic string variant.

     Patch Set 6:
         1. Fix the commit for 'dd SMS to calendar remind' to 'Add SMS
to calendar reminder'.
         2. Fix the mistake use description as title in the create
event.
         3. Use 'Intent.ACTION_INSERT' to instead of 'Intent.ACTION_EDIT' to keep compatibility with third part calendar application.

     Patch Set 7:
         1. Change the function name from 'addToCalendarRemind' to "addEventToCalendar".
         2. Reuse the define in android.provider.CalendarContract and android.provider.CalendarContract.Events.
         3. Remove the extra brace that will break the compile.

     Patch Set 8:
         Add a blank line after the first line and before the rest of the text for each comment.

     Patch Set 9:
         Add blank line in comment message.

     Patch Set 10:
         Remove Patch Set 9 depend on an abandoned change.

Change-Id: I7fd4165aa90258951d8adbfd13ef438c66634075
Merge "Mms: Add new feature 'Add SMS to Calendar remind'." into jellybean
Mms: Updated italian translation

	Added strings for dark/light theme

Change-Id: I4b1c43a3d16db5dbf57a066b33fa5ce70feb1c56
URIs are now absolutely unique, also added the TextOffsetSelector
Add background image, cherry pick from no_login branch
Build property tweaks
Fixed root directory issue
Added test for tower
removed test for tower
Removed SiteNow1 sub theme
Merge branch 'refs/heads/master' into test
Fixed a typo in the help text.
Switch to camera HAL from ZTE Blade - Panorama fixed
Forgot a backslash

Change-Id: I8b84f54e3bb945c8608b11c52f0469cfc1efb469
fixed Fahrenheit mix up
filled ui interface with logic
Settings: Add the OTA updater

Change-Id: I725106a247278f2f7d571cf03ccfb0b6e1bcf356
Merge branch 'ics' into MiniCM9
Add eclipse settings.
Update link to project site which has been relocated to GitHub.
Preprocessed all printfs in Commands
Merge branch 'alex' of http://github.com/Nashoba-Robotics/Nashoba-Robotics2012 into alex

Conflicts:
	Commands/CameraRotateToTargetCommand.cpp
	Commands/DriveToTensionRangeCommand.cpp
	Debug.h
Add onClick action to notification clock and date

In expanded StatusBar
- clicking clock opens alarms
- clicking date opens calendar - today selected

http://www.youtube.com/watch?v=MLom5e3nQoA

PS3: added turn-blue-on-click
PS4++: nitpicking cleanups

Change-Id: I850732dcca0e65af59ce009aaf9f7ba18bcaf915
Merge remote-tracking branch 'cm/jellybean' into jellybean
include PDroid patches

http://forum.xda-developers.com/showthread.php?t=1923576
PDF 출력을 위한 에러 로깅 기능 추가
doc devi fare
A few updates to the README
completed the coffeescript
Populating Course Categories
Menu updates

joepie!
Bug 383830: Fixing tests and references description to match following definition:
"All doc comments start with a summary sentence, that ends with a period or a question mark. An optional description may follow."
Simplified Chinese translation update
Merge pull request #2 from GentryLamp/gingerbread

Simplified Chinese translation update
1) removed HTC crap
2) fixed interactive idle

Conflicts:

	arch/arm/mach-tegra/pokecpu.c
Conflicts resolved (KeyChain & KeyStore need revision)
Long press to kill:  Bring changes done in cm7 to ics
Use normal mosaic jni with LegacyCamera

Change-Id: I9ba338b717b3c96c5508fa3b80327cd66b934185
using slre to match metadata family / key names
revert som paths
Disable data use monitoring on the wlan0 interface by default

The system's framework monitors rmnet0 (3G) by default, and that's
surely the desired behavior.

Change-Id: I375d34e71a940983c3f90682ef9c9300e261d814
checkbox should reflect service state, even when activity is destroyed or paused
sticky seems to make it too aggressive
license
Merge branch 'master' of github.com:alanszlosek/android-accelerometer-gps
fixed up servcie host
* verbose change name to debug
* removed config for methods names that handle events in the listener
* listener onOpen and onClose just get the connection as arguments
* no message is sent if connection isAuthenticated is false

b Please enter the commit message for your changes. Lines starting
Minor changes related to integration in Extended Categories
use newer scala/akka
don't track database.yml
added ability to declare fields to route through the STM system
added ability to sync fields to the database
don't track database.yml
clean up the Marten Agent
can now sync both ways with the database

refactor to stick the database syncing code in the database_magic
added clean ability to spawn a new agent
Merge branch 'master' into ticky-activerecord
goole rest
Added docs for perimeterlocked and perimeterunlocked events in blackberry.system

Reviewed By: Jeffrey Heifetz <jheifetz@rim.com>
Tested By: Tracy Li <tli@rim.com>
Fix deps #2
Update composer to use allplayer lib as dep (guzzle inherited).
Add logout support.
Add copygroup functionality on URL and form features.
CDaemons : startIfNotAlive (used by Webmanager)
Settings : after deploy.
bug ajax post
Arreglo flechas menu.
Ampolleta FCI con if de explorer.
Merge branch 'dev' into work-cata
finally fixed entering mulitple phrases
consider known extensions as media files

this is only important when not analyzing logs created by logstats
plugin
more localization
Rebuild all t4 template due project build
fix notices and bad links
Started working on the ASP.net MVC documentation
Updates on classpath.
Initial version of a menu system that can be used to configure options and
access functions on the watch
New map with taiga hills instead of extreme hills
Corrected  in template
[c] Concat libs for production
[c] README.md revision
[c] Typo
Merge pull request #2 from kelonye/master

Single file for production env
fixed spawing / movemnt bug. bugged eating
eating bug fixed. simulation is working fine now
Removing unneeded horizontal rules.
merge new GPUImage to deal with front facing camera landscape issue
init file commits
additional beforeLoads and cleanup, lots of cleanup.
also a bug fix for subreddit manager that was introduced with the "getlatestshortcuts" function
always display conference home button
decoupled from lsecities-2012 theme
updating event programme
Added some things about heroku.
Sun!
corrected the package in shape_visualization.launch
Merge pull request #1 from ipa-goa/master

shape display fix
Merge branch 'master' of https://github.com/ipa-goa/cob_environment_perception
removed debug output
fixed fake mapping, added new maps
marked some msgs as deprecated
switched fake map
Merge branch 'master' of github.com:ipa320/cob_environment_perception
Merge branches 'master' and 'master' of github.com:ipa320/cob_environment_perception
id is set correctly now
minor fixes, fixed markers, added node namespaces
updated manifests
updating works now
Merge branch 'master' of github.com:ipa-goa-sn/cob_environment_perception
Merge branch 'master' of github.com:ipa-goa/cob_environment_perception into review-goa
Merge branch 'review-goa'
Merge pull request #7 from ipa-goa-sn/master

updating Interactive Markers works now
merged goa
PACL Support and bug fixing
deleted static index page and routed index
Changed the import settings according to django standards
add sgd / compare performance
traer la ultima version de nitf
Basic maven project structure added
viewport
Merge branch 'master' of github.com:loicknuchel/democrazy-hacktheelection
Add support and development docs
Fix standard error test

Do not test against the Python version, because pypy adds build information to
the output of "python -V" and hence breaks this test. We now write a fixed
string to standard error with "python -c".
Added followers and following info
Lagt til categorizr-side og device-side
Merge branch 'master' of https://github.com/mesan/miniprosjekt-mobil-web-ux-html5
Added Open Folder.
splitbuild of realgcc and bootgcc into different folders
Fixed plug_interface(), load new port to check attachable.
Fixed vifinfo_cli.py help message.
Revert using Ringtones here

Change-Id: Ia4eeb927f2ae8b2db4c27699c472da27608e1aa0
croak is easier for troubleshooting missing arguments
added all 4 tests in the litle spec
test resource
added images required by the unit tests
New Weather, Toogle icons
Templates with new zipalign
Overvies for Lidroid toggles
Update.txt edited
Options fully working.
Auto-refreshing and Refresh button kinks worked out
Event handling is still being worked on
Moved JS to bottom of the page
Empty project with Core Data and Storyboard
change a in button class in box-video-corso e featured-corso
Added new jQuery UI styles that better match WP core for #314
Updated language files and fixes to the discount code system.
shortening logout message because when you logout the message was wrapping and pushing the form down
the mssage now fits on one line and looks better
removing extra comma
render instead of redirect
officer signup
Database config para pas.plugin.sqlalchemy
Merge branch 'master' of github.com:davilima6/ploneorgbr.portal.policy
Merge pull request #9 from davilima6/master

Database config para pas.plugin.sqlalchemy
Re arrange settings.
Deployment solution.
Fixed broken links inside READMEs.
collapsed removePublicxxx to unadvertise.
refactoring master api to be more like rosgraph master.
rosmanager fully converted to child of rosgraph master, much less code and  also note that it is not really a ros manager - it is an api to the master itself. There are ros params and services and topics and callbacks outside of this.
avoid building, rosbuild takes ages now.
avoid building here as well.
remove catkin tags, how did they get in there?
Merge branch 'master' of https://github.com/robotics-in-concert/rocon_multimaster
bugfix version bump.
- Reduced the minimum of OptionalHeader to support specially crafted programs.
- Modified get_hamming_weight to make it independent of bit-or operator.
Added localization
Restructured player and server systems, implemented localization
bugfix:
There was a wrong sql statemet in the locallib
 function scheduler_get_user_appointments


Signed-off-by: semteacher <semteacher@gmail.com>
Merge branch 'hotfixes' into new_conflict_settings
added osx window manager
Added comments to cut bitrepo out of the workflow
[maven-release-plugin] prepare release yousee-ingest-workflow-parent-0.6
Add a custom variable to pass 'step'
Change user updater to user.
problem 10 solution
problem 11 solution
problem 12 solution
problem 13 solution
problem 17 solution
problem 23 solution
problem 25 solution
problem 7 solution
problem 9 solution
version 1.2.07 velvet code
default version is 1.2.07 +maxk71
Merge branch 'master' of github.com:ucr-bioinformatics/biocluster-modules
check if button has been added
Merge branch 'master' of github.com:upfrontsystems/upfront.assessmentitem
Added an rss feed for rivers

* Also reorganized the feedwriter plugin and now making use of the Univarsel Feed Writer class by Anis uddin Ahmad (http://ajaxray.com/blog/php-universal-feed-generator-supports-rss-10-rss-20-and-atom)
Added solr field mapping documentation to the WSLS transformation.
Adjusting alt and class.
extra directory access for upload_file
no need to check for model type when getting object info
Transcripted code from old object literal to jquery module pattern.
rename
update remove example
Ref : phy reord
update to jquery to fix #110
Merge branch 'patch-2' of https://github.com/BinaryKitten/ZendSkeletonApplication into hotfix/132
Merge branch 'hotfix/132'

Close #132
Close #110
dropping OBS repos
QDevNetからICS用のAdrenoドライバ取得説明を追加
純正ROMのFINGERPRINT等の上書きを行うようにした。
ServersMan SIM 3G 100, IIJ mioと純正ROMに書かれてたapnを追加するpatchファイルを追加
デフォルトフォントをモトヤフォントに変更するパッチを追加
純正ROMのpropを追加と関連したファイルを追加
OpenWnnに必要なファイルを追加
Temporarily disable our hwui whitelist and blacklist. We will update these with feedback from the forum users.
removed pvrsrvctl
no bug version
use iv directry es.next.js
Update notes for submitted changes

* p1c: fix-up pppd_cdma services
iyokan: Fix front camera

This line seems to be required on gingerbread but it breaks the front
camera on ICS.

Change-Id: I6c4812f0a890eab61e44caccd032af64159e265d
msm8960: HTC: remove config option for HTC 2-phase ondemand

Change-Id: I152eee22f174294b246501494861cbb684e66842
Up ws
ajouts premieres maquettes
Update enjoysocialsport/README.rdoc
Update enjoysocialsport/README.rdoc
Update enjoysocialsport/README.rdoc
Update enjoysocialsport/README.rdoc
 up project
up Project
Mise à jour images
up project
barre de header
up Header
Footer
Changed to wipe /sd-ext/data/data for installing updates
Reword my about me section a little bit
That favicon looks bad and I should feel bad
Cleanup css a little bit
libgenlock: LOG* -> ALOG*

Change-Id: If9cdb50008d0011a48920d8af00aafb761e576b6
libgralloc: LOG* -> ALOG*

Change-Id: I44a9a193ee50f52764bdb84efce0c1dee48a72e8
libqcomui: LOG* -> ALOG*

Change-Id: I1fd819627f4e94f978741746d5a66597b9f4c2f5
libqcomui: fix surfaceflinger include path

Change-Id: I9dc7dae586bcf91f0d3488d6b389681e7d517af5
libcopybit: LOG* -> ALOG*

Change-Id: Ice1023b69c99e83eb575084dde77ea94d4343832
Bring back white holo background
add base user ratings
Merge branch 'master' of github.com:HackOmahaFoodInspectors/food-fight-api
Cleaned up export PATH in installer, don't need to give everyone MY full path, my bad
Fix sdcard mountpoint
Add about EVOLUTION
Milestone 1 + pulizia
Generalization of lazy node creation. Auto create node if hook not exists.
Allow users to set config variables in development.yml file
Merge pull request #38 from tmock12/easier_key_store

Allow users to set config variables in development.yml file
Whitespace characters are no longer bright white. They are now the same color as the right margin.
Update README.md

Spelling/Grammar Errors fixed
Fixed Constructors to allow for the Qualifier to contain a list of Answers and Answer to Contain its Qualifier
hide the slider/banner navigation dot on post/pages
Give the banner/slider header more text space on small displays
Refactoring "Add ability to hide volume rocker preferences"
Reworked dependency loading into a bootstrap file.
Created an intermediary class between service classes and SoapClient.
Updated README to demonstrate the "new way" of making requests.
Added admonition about PHP 5.2 support being moved to a branch.
Update dalvik heapsize configuration for ICS compliance
added customized default template
Merge branch 'sources'
theme installation
record and report method errors in rollup
Merge branch 'master' of github.com:WardCunningham/Smallest-Federated-Wiki
throttle sitemap fetch rate
throttle rollup fetch rate
catching up with javascript
ARQ-939 Add Maven Release Plugin configuration
ARQ-939 prepare release 1.0.0.Alpha1
ARQ-939 prepare for next development iteration
updated the code.
This code is fast and good for similarity search.
The FPs can't be used for substructure search.
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
test case
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
Readme runtime updated
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
Readme runtime updated
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
updated the code
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
readme updated
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
pushing a little bit more of terminology cleanups
V1.2

changed font-color
[TIMOB-11549] Failed tests are now printed at the end so they can be easily copied
[TIMOB-11549] Bugs in duplicate property declaration validation
[TIMOB-11549] Fixed a bug with converting objects to property descriptors
[TIMOB-11549] Fixed some bugs with default prototypes
[TIMOB-11549] Updated execution timeout to be more robust
[TIMOB-11549] Fixed some regressions
[TIMOB-11549] Created a file for tracking tests that are failing but won't be fixed for the time being.
[TIMOB-11549] Implemented the call method for function prototypes
[TIMOB-11549] Updated the prototypes for primitive objects to contain their default values and classnames
[TIMOB-11549] Fixed a bug with when arguments were parsed in function calls
[TIMOB-11549] Fixed section 11.3 tests
[TIMOB-11549] Fixed descriptor for array.length
[TIMOB-11549] Updated the harness to work in Windows
Merge branch 'master' into timob-11549
[TIMOB-11549] Fixed section 11.4 bugs
[TIMOB-11549] Finished up the chapter 11 tests
[TIMOB-11549] Missed a section
[TIMOB-11549] Reworked the test harness to use node cluster to handle runaway tests
[TIMOB-11549] Added support for sub sections to the filter
[TIMOB-11549] Sight polish for the test harness
Adds result set iterator.

The relations iterator doesn't do anything smart at the moment. It is
mainly there to be symmetric with the future queryResources iterator.
Fix variable reference notice.
Added basic static design
Empty solution

and some decent default ignores
Added contract project
Added internal messages assembly for commands
Added touch support using Onswipe
Make blogs final without images
Add a screenshot image to readme.
Use Gatling logo
post about zsh's command not found
db user, mysql funcionando!
removed old non nuget packages for NHibernate and FluentNHibernate
added packages
didn't realize I didn't need the current directory
Added NOC_1_5_vector_normalize
Added NOC_1_7_motion101. Adjusted readme files.
Added NOC_1_1_bouncingball_novectorsApp.
Added NOC_1_2_bouncingball_vectors'
Added Example I-3NOC_1_3_vector_subtractionApp.
Added NOC_1_4_vector_multiplication.
Added NOC_1_5_vector_magnitude
Added NOC_1_5_vector_normalize
Added NOC_1_7_motion101. Adjusted readme files.
Moved cinder specific readme into cinder readme file.
Moved cinder specific readme into cinder readme file.
Added NOC_1_8_motion101_acceleration
Added NOC_1_9_motion101_acceleration
Added NOC_1_10_motion101_acceleration.
Added NOC_1_11_motion101_acceleration_array
Adjustments to formatting for consistency.
adding support for netbooter through snmp
Added a reference to SHAPEFILES_DIR to the README file
Killed errant textile header in README
Replaced link to deprecated repo with link to hacktyler repo in README
Typo
Typo
Typo
Trimmed top
Trimmed top
Trimmed installation text
Consolidated some redundant examples
Broke out -d example
Cleaned up flag leadins
Cleaned up advice a little
Cleaned up advice a little
Tweaked title
Tweaked lead
Added a custom management command that create a new definitions.py file from scratch.
Added startshapedefinitions to README
Moved hacktylers ider and name functions into the app.
Added INSTALLED_APPS and urls conf changes to installation section of README
Add support for custom domain marshaller
CORE-3453: updated compatible version number
Some small tweaks and a bunch of notes
Add P-P-P-Pokerface.
ville: don't use prebuilt libril (2/2)
Merge pull request #3 from xkonni/ics-pull

ville: don't use prebuilt libril (2/2)
Initial check in of unit test project.
Added orange button (without text)
DBUpdates
publishing post about failing, picking myself back up
adding plugins preso
Began work on the settings page.
Site updated at 2012-04-02 14:15:47 UTC
fixed indentation errors, abstracted solr config
fix makefile
Merge branch 'master' of git://github.com/kenjione/simple_diamond_dmc_simulation
readme
readme
rename classes tree file
Merge pull request #31 from newmen/master

Добавлено README и авто-генерируемая картинка
Don't rely on return value of course_set_display - it returns 0 for guest

Guests were only able to see all sections at once, no matter what they clicked in the menu.  This was because course_set_display returns 0 if you're logged in as guest (it also skips out early, rather than saving to to the database).
prevenção de xss nos parametros por get do plugin
Merge branch 'prevent-xss'
redirecting old URL to new URL
just a image repo now
[+FEATURE] Added modman configuration for frontend js
[+FEATURE] Added first release of configuration and fe validation
Merge branch 'master' of github.com:magento-hackathon/products-drag-n-drop
Site updated at 2012-03-20 12:40:42 UTC
Actually execute the install file
HL check
Fixes and (before we go any further) commenting...
fixed bug in default argument
got rid of some unnecessary performSelector calls
Update README.md

Comentário ae!
gmaps hack: update summary strings

Change-Id: Id49f10355e2743fbf05aa5bd4c405acb5fa7e6da
upload new class and docs
delete old class file
Updated _posts/events/demo2.md
Sample entities with auto-generated key
Adding Guava as test dependency
Updater is now a separate class, returning Map rather than taking mutable map as an argument
Updater -> RowUnmapper, can't think of a better name
JdbcTemplate is no longer part of the application context
Tests of delete by ID
Tests of count()
Deleting by entity object tested
Tests of batch insert and deletion methods
TODO: some ineffective methods
deleteAll() tests
Fixed findAll() ordering without paging
Missing assertions
Sorting by multiple properties and multiple records
findAll() tests with sorting and paging enabled
Trailing spaces, checkstyle error fixed
NXP-10478: forgot to update the suggester
Remove unnecessary imports.
Cleanup trailing whitespace.
Merge branch 'master' of github.com:oerpub/oerpub.rhaptoslabs.swordpushweb into gsoc2012
Updated Views to conditionally check JOD's status before using it to convert
Merge branch 'master' of github.com:oerpub/oerpub.rhaptoslabs.swordpushweb
remove line numbers
Merge branch 'html5' of github.com:oerpub/oerpub.rhaptoslabs.swordpushweb into html5
I like cleaning, cleaning and cleaning!
nice docs for scale function
added archive, exercise 2 complete
Add panicIfError()
Should use bundle install instead of bundle
Updated puzzler 27 ("Keep On Padding") based on a subsequent puzzler submission (https://github.com/scalapuzzlers/scalapuzzlers.github.com/pull/57) by Luc Bourlier
flesh out project pages, add sub entries, finalize category scheme
Site updated at 2012-10-10 05:41:19 UTC
rewind to origin bootstrap
2nd-init: fix indentation and warnings

Change-Id: I7340d7c95ee7e8320b45ac4e5baf995471626385
settings: add volume rocker resource

Some devices, such as the LG G-Slate v909 (PMU), don't support
Volume Rocker Wake. This commit will add a new boolean resource
(config_volumeRockerWake) to allow disabling the feature easily
for devices that do not support it.

Change-Id: I42c3d8d5bad9ae2244521fc50264c774d2edfb20
color adjustments.
Fixed bug in extlink handling when extlink token is not a link.

* [foo's] was getting parsed as <span>foo' s</span> when the
  extlink token was reconverted to text.
* One more wt2wt test fixed.
* Eliminates RT errors from en:Giulio%20d%E2%80%99Este

Change-Id: I988cfdf1ccf56597ddee88ca7b205d5dbf371dea
Merge "Fixed bug in extlink handling when extlink token is not a link."
Ignore distribution files
Use Depency Injection to get the Facade injected
Use DI to inject that damn facade. EVERYWHERE \o/
fixed errors
Merge branch 'master' into userviews

* master:
  Added Image model, forgotten in last commit
  created models for Products corresponding to ShopSense API
  updated spec user tests
  fixed typo in exception in models/user.rb
  commented rspec
  adding rspec files
  adding rspec files
  seed data added to seeds.rb
  seed data added to seeds.rb
  contraints on user insertions functional
Merge branch 'master' of github.com:AdvancedClothingSolutions/SeniorProject into userviews

* 'master' of github.com:AdvancedClothingSolutions/SeniorProject:
  fixed rspec tests
  validations added for all models associated with Products
Revert stupid thing
init.rc, revert revert IO scheduler
Camera: add burst mode (up to 20 shots)
Rebased for jellybean.

Change-Id: I182554ce32bd8ac62cd1aeaff84f21d4fcac3f30

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/camera/Camera.java
	src/com/android/camera/CameraSettings.java
Camera : Timer Snapshot

Allow user to take a snapshot after a certain amount of time.
Credits : Michael Simon for the base port
	  David Van Tonder for indicator icon

Change-Id: Ic50bf1c1f7fd85d8c48dac3e51766aeff2b381ea
Camera: Add volume key to control the zoom in/out.
I will make my phone in lanscape when I take picture or capture video.
I feel it very not easy to adjust the picture zoom size by touch the
screen, because the take picture button in the right side. The finger
in the left hand is easy to push the volume key, so I make the
volume key up/down as the zoom out/in.

Patch Set 5: Remove the unnecessary whitespaces.

Change-Id: I303759aa834fbef5084313931925ff0b21fe571c
shooteru: misc update

fix camera blob
add custom media profile
move network stuff into main class

Change-Id: If9b796159872aee2933d7b7512c923ab70a44e0a
Update notes for submitted changes

* remove the FM Radio Si4709 module from i777 builds
Update notes for submitted changes

* coconut: add custom toolchain
Update notes for submitted changes

* coconut: remove deprecated libv8 prop
Update notes for submitted changes

* kumquat: duplicate blobs to satisfy audio dependency
alsa_sound: Add miscellaneous fixes to AudioSessionOut.

- Remove reset from stop function. reset should be only called
  in the destructor as it closes all the threads and deallocates
  all the memory
- While iterating through the Device list, break out of the loop
  once the use case corresponding to the device is removed.

CRs-Fixed: 396029
Change-Id: Ifa449fc5aba93b3e88c52f55219110027e4a8684
(cherry picked from commit 991d9cae7c96338691ec2bbf2aad7ddc6328a6da)
Update notes for submitted changes

* audio/msm8660: re-add HTC acoustic audio/aic3254 support
Improve toast strings.

Change-Id: I535ab5bb89941a0e9c9a34a8d69caf84437b2bce
Merge "Improve toast strings." into gb-release-7.2
Update hungarian translation

Change-Id: I87169137d7176956e7b0a872a2aecc04093055e0
Merge "Update hungarian translation" into gingerbread
Initialized new member in the constructor
Add quiet hours support for Bln (1/2)
update recovery_ui.c to replace the power button with "back" instead of "select" to prevent accidental clicks/getting stuck in key test advanced option.
Merge pull request #4 from smirkis/patch-1

update recovery_ui.c to replace the power button with "back" instead of ...
Avoid accessing binaries via $datastream->content
Merge pull request #35 from adam-vessey/7.x

Avoid accessing binaries via $datastream->content
Changing Some Serialization Stuff To Seperate Files
added menu screen
Added test animations for the horizontal dash and the downward dash
new test branch for enemies, lives and score
merged Kerby and KerbyTest
merge Kerby and KerbyTest
merge Kerby and KerbyTest
Finish merge of Kerby and KerbyTest, switching machines
enemy renders and moves on platform
added coin feature
linked coin system, added player sword slash, added kill and be killed by enemy
added collision sizing, end game, preliminary reload screen
merged sam and KerbyTest branches
Update m.css
pasta de templates removida do tema do evento da rede
ordem dos items do menu principal alterada e link para a rede adicionado no template do menu]
Github Issue Fix #13 - Script-Version in der GUI anzeigen
Replace 200 status code with 400 for exception.
Option form is almost working with config.xml file.
DeskClock : Updated Slovak translation

Patchset 2 : Removed czech text

Change-Id: Iea966958d8b9a4b08c852083aec060f3423ce8b1
Fix duplicate resource.

Change-Id: Iec2008a9f65996dd3d467ac6ae311ac514c41e00
Merge branch 'gingerbread' of github.com:TeamFun/android_packages_apps_DeskClock into gingerbread
#_20: (Bugfix)
negative Schwellenwerte oder Tourenlängen nicht mehr möglich
Added support legacy Qualcomm OpenMAX IL libs for MSM7x27
Restore existing Playground frameworks modifications
framworks/base: Changes to use MVS path for VoIP feature

- These changes are merged from GB commit
  3926cd8fea11e65f47272c2099a5a540ab46b580

Change-Id: I9bc09e3f82741db394bf5e9585e9e35a454112e5
Added support for customization of mobile data setting.

Introduced system property "mobiledata", which will be
used for default behavior of the mobile data connection
either on/off.

This is analog to how the setting for "dataroaming" is
handeled.

Change-Id: Ifae8822dedfa55a515671014e2e29d43c469e701
libstagefright: fallback to software encoder for high resolutions
libstagefright: add 720p encoding support
Telephony: Reset the data registration state on radio off/unavailable

CRs-fixed: 380373
(cherry picked from commit 6716ad9c64467e01b268108909c2ef64430b6b9f)

Change-Id: I0973a583704ab502d7b7b22125bd314ed42703c9
telephony:  Fix MMS for when operator has different APNs for Data and MMS

Change-Id: Icf0bc8919bf5f774741081a33533973703ada183
Fixed: missing new voicemail notification with some carriers/devices

The bug has been desbribed/documented pretty well over here:
http://code.google.com/p/cyanogenmod/issues/detail?id=2801

Change-Id: I954c0857a99bd18671abb890cf2ef3cafa86fbb4
Modify stagefright return to support partial merge
Fix wrong count return for getPhoneSignalStrengthCount

Test report for the time spent in each signal strength bin, along
with the number of times that bin was entered showed the result
as Bin=3 Time=3211926000 Count=0. With a non-zero Time, the Count
value 0 was wrong.

The cause of the problem was that getPhoneSignalStrengthCount() used
mPhoneDataConnectionsTimer, instead of mPhoneSignalStrengthsTimer,
to get the count.

Change-Id: I55ac1125abfcfdc105605d76d1c706ac315b90cc
ARQ-785 Initial implementation of managed WebLogic 10.3.x container.

The managed container implementation uses the startWebLogic and stopWebLogic
scripts in the WebLogic domain directory to control the WLS container.

Refactored the Container configuration classes. Introduced
ManagedContainer and RemoteContainer classes to encapsulate operations
on managed and remote WLS containers.

Refactored and improved the test suite for WebLogic containers.
Introduced tests for verifying-
 1. JAR deployment,
 2. Testable API of Arquillian-Core 1.0.2
 3. Multiple deployments in a test class

Segregated the others into tests to verify deployment of EARs and WARs,
CDI injection, Resource and EJB injection, ArquillianResource injection
of URLs and tests run at the client.

Detects if the startups and shutdown script has not completed by a
pre-determined timeout period, and terminates the script if necessary.
next snapshot version for develop branch
Updated to latest Robotlegs2 and Starling revisions
fixed translations, moved normal background into lines
Add Tracker

I hope.
PT-BR: Translations for SMS Mock

Change-Id: I511a28c53191b449b8cb249c16cd3023cb072cd7
Settings:
Minor corrections and a few additions to the danish translation

Change-Id: Iafa19ff7f56b5fa7beb73179d6505a5f5d9e287c
Settings: Updated italian translation

        Added strings for mock SMS messages

Change-Id: I704cfa8d72b8eedd5b6f75566978c10a8f64f3b1
Settings: updated romanian translation

Change-Id: I0290b9339302cbad5f8712fec7322e9f9332779b
Merge "Settings: updated romanian translation" into jellybean
Merge "Settings: Updated italian translation" into jellybean
Merge "PT-BR: Translations for SMS Mock" into jellybean
Revert "Settings: updated romanian translation"
Duplicate strings, breaking build

This reverts commit 9b68663e099cad73e31af570607de6521b4169f4
Merge "Revert "Settings: updated romanian translation" Duplicate strings, breaking build" into jellybean
Merge remote-tracking branch 'cm/jellybean' into jb-dev
3 update

exception of glucose & temperature, update IntravenousInputMachine in
Monitor
gui bug fixed
Merge branch 'master' of github.com:charmjunewonder/PatientMonitoringSystem
new favicon, updates to README, more instances

Better favicon with more contrast from Monica/D
Updated README to point to example app and explain more about instances.
Made manifest deploy 2 instances by default to demonstrate balancing.
Merge pull request #3 from andypiper/master

incorporate suggestions from Monica
Update input_levenshtein_distance.txt
fixed a bug in the previous bug fix
changed up the ItemArg arrays in each ItemType (e.g. no id required for votes)
customized how votes are listed in ContainerPanel
deleting links when items are deleted
using flask-testing
"Changes" is CPAN::Changes::Spec compliant
Add compiling instructions to README.

Also:
* Fix warnings related to Ant 1.8.
* Fix the 'run' Ant target and add the 'runjar' target.
Because I automatically do a git commit -am, I accidently added a broken schema.rb on the previous commit. I've regenerated and this contains the updated and correct db/schema.rb file. Future commits will be done with just git commit -m
Moved the Readme file
Add sanitize.pl to version control; populate README.md.
Add support for Method Security Expressions OauthIsUser OauthIsClient
#1 Importing code on github.
Merge branch 'master' of github.com:freedomsponsors/www.freedomsponsors.org

Conflicts:
	djangoproject/frespo/env_settings.py_template
	djangoproject/frespo/settings.py
Added button positioning on mobile's orientation change
secured delete-method => now users can only delete their own timeTrackers except they're admin
Working app.py for page load action
core-3216 fix idrop lite task bar button remove issue
Some other jb changes
add input for alarm active, output
Added icon_sprite for ui.
Refinement of the logo.
Merged conflict.
2012.08.16
* Added Notice dashboard
* Summary statistics count log entries from all hosts and the two possible RB indexes.
2012.08.23
* Update to the Information Dashboard
- Correctly handle division-by-zero by raising an exception.
- Instead of failing with "failwith", now we raise exceptions with OCaml-compatible messages and the equivalent .NET exception as it's inner exception.
- Remove special character.
- Implemented some tests for division-by-zero and string parsing.
0.0401
       * Forgot to test for "data-src" when creating cloudinary_js_image()
Add CA cert verification to fix OpenSSL::SSL::SSLError in Ruby 1.9 http://martinottenwaelter.fr/2010/12/ruby19-and-the-ssl-error/
Merge pull request #24 from saizai/master

Add CA cert verification to fix OpenSSL::SSL::SSLError in Ruby 1.9
LaTeX
Merge branch 'master' of github.com:laoyang945/vim-vimperator-configuration
linebreak
added css, img thumbnails, edited some content
usernames refresh correctly
fixes:

* weapon visibility
* visual glitches
* steam dir/user defaults not working
* visual glitches due to viewmodel_fov 0.0001
* default now optional
* other stuff
Added BSD license to the code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README
-arbeitspaket3 finished
Don't cache contact list and T9 characters longer than the dialer's
lifetime.

- T9 characters may change if the user changes the OS language
- Contacts may change anytime by user's actions (add, modify, delete,
  sync)

Fixes http://code.google.com/p/cyanogenmod/issues/detail?id=6084

Change-Id: I171032b441e56dd2b7ce3c90535db4683fb79668
Add RecruitmentSegmentLink domain class and unit testing for the class.
minor graphic improvements
Fixed a minor bug relating the recently added combobox widget.
Export availability reports in excel format
Merge pull request #11 from nemesisdesign/master

Export availability reports in excel format + other minor fixes
Fix for Windows

Remove submodule
Merge branch 'hotfix/v3.6.3' into develop
added texture loading system
Only upload files that have changed (based on size and timestamp)
Added comments
Other minor changes
GateIn 3.2+ support
Site updated at 2012-09-04 15:25:40 UTC
Add vendor submodule for Twitter Bootstrap
Add fabfile for updating vendored bootstrap
Update packaged @bootstrap to v2.0.3
Whitespace change
Make sure that subNav code only executes when there's a subnav
Add in support for a searchable AppList object

This is a first pass, probably needs a *lot* of love, but it's a start.
add test for spaces
Update PagerFanta required version to be set to Symfony2.0
UI Elements for Write Program tab.
Logo Grande

Logo grande do posterous
fixed broken selenium tests for search

- changeset I29074acf removed extracts, so selenium tests should be
  adjusted as well.

Change-Id: I8cb52ef9dca3541e8a86db28bec676968e21792f
Merge "fixed broken selenium tests for search"
update gitreview to match branch

Change-Id: I903bc66ee57b1161f873a90f4b27b40f377501e8
keeping the old compare summary page. will add a new action in bug_reports controller to compare summaries
Collapsing parent element when no image is pulled
CSS tweaks
Reseting model files
Resolving conflicts
- Changed the name of the cached google objects
- Optimized the way the criterias are generated. Instead of looping through all checkboxes, we just keep track of the criterias as they get added/removed.
Merge remote-tracking branch 'nic/master'
Added a bounce animation when focusing a marker.
Renamed some files to something more meaningful.
Added a json file that contains the markers data.
Renamed the data files for consistency.
Moved utility functions outside app.js
Cleaned-up the search service code and reduced the risk of SQL injections by using mysql_real_escape_string around passed arguments.
Implemented makers clustering.
Merge pull request #8 from scarsick/master

Enhancements and bug fixes
client side caching and filtering
Delete XLS spreadsheet

Spreadsheet was original used to gather and manipulate raw data now in
JSON format
Merge branch 'master' into client-filter
remove debug logging
remove extraneous installation tokenize invocation
sector filter bug
generate checkboxes from data
Installations sous forme de tableau

Permet d'énumérer les installations beaucoup plus facilement
Lat et Lng sous forme de nombre

mieux qu'une chaîne de caractères
Balancoires -> Balançoires
init.herring.rc: change scheduler permission location

Change-Id: I395a95a039b810c493ef73fb2f218d8eac6bcab8
d2usc: Add dependency on qcom-common repository

Change-Id: Id0d121ee7dc33a7520fda163013003ede0e05ea0
Update notes for submitted changes

* i9100: cleanup proprietary files
Fixed animation issues. Closing animation works, opening doesnt. You can now write your two layouts in sperate xml files and use their ids to reference them in the setViews method. Using the showMenu method will open or close the menu based on a boolean parameter, will change that to not require one."
Added method definition section
Added anonymous function declaration in php
Merge branch 'master' of github.com:GreyCat/programming-languages-comparison
Site updated at 2012-09-15 02:32:18 UTC
Seeing if <br> will add the breaks
hwc_external: Support auto-setting of HDMI resolution

For devices with trouble matching the HDMI clocks in the receivers,
add the possibility of letting the controller choose the resolution
on its own with the build-time TARGET_QCOM_HDMI_RESOLUTION_AUTO flag

Originally from CM9's Change-Id I3ca0639e9f644872a3585f04f2cf8180d8451f2c
at frameworks/base (on hdmid)

Change-Id: I5690213ef1b745c72107dbb2f0203c741580674d
Older QCOM devices don't support OVERLAY_COMMIT

Amend: Fix tab conversion

Change-Id: I9241adef001f26fb7611623a23e05e559589532f
hwcomposer: Modify qcomuiClearRegion to rely on GPU layers only

Even when GPU composition is used, it is possible that no layers
are going to GPU. (e.g. video playback in overlay targets)

So it is enough to just check for number of layers going to GPU.

CRs-Fixed: 411258
(cherry picked from commit a136b688321d41b7fb2c74c1dfb875e690be23ed)

Change-Id: I8e5974e1fa1f29bfcb67cb3c74ed935e8335a953
liboverlay : Update magnification limit for MDP 400

Update liboverlay to address magnification limit for MDP 400.

MDP 400 has magnification limit of 8, and MDP 410 or later has a
magnification limit of 20.

CRs-Fixed: 413535
Change-Id: I7e1c83f1d0087ecb54208a26a49a977497e48ab5
hwcomposer : Send Video layers below skip layer to GPU

We need to send video layers below skip layers to GPU, to avoid
artifacts, during video animations.

This is not applicble for 3D and interlaced videos, as they are
not supported by the GPU, and we will see a blank screen.

Change-Id: I45f61e3a8bdb538d5dfd8c5f39b7ec5443d7074b
CRs-Fixed: 410039
display: Unbreak GPU layer detection

 * Fix a mismerge that was breaking detection of GPU layer
 * This was causing display artifacts when C2D was used

Change-Id: I1a4280b7403385d942f3307c3dbc32dbe21eb35b
display: Link liboverlay with libqdutils

Change-Id: I81db07e5a3a3d66b11e18ecfce44b2bfd7d1f514
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_hardware_qcom_display into jellybean
Added Campaign Monitor form and tested
Added include to signup form
msm8660: Use MM heap for camera
Remove enabling software decoder for stage fright, use HW
Enable some board stuff, remove some unused flags [sorry]
switch to full defconfig and use correct HW rev.
Ordered galleries in date order...!
Cleaned up file and added documentation for the interface.
Merged audio/video javascript files.
Updated README
Edit delete script so it will only change permissions.
Change names for scripts.
msm7x30: Remove flag BOARD_USE_LEGACY_TOUCHSCREEN

This reverts commit 11a57f2e8bc22d79d6dfb36b613f9d9995216d04.

Change-Id: Ie084429b0d74d3501accbddc178d463c66f8266b
console: Add "using" keyword to shut up compiler warnings.
sid: Use GLib MD5 implementation.
sid: Use AUDDBG.
modplug: Fix ISO C++ violations.
Errors fixed
Errors fixed
Removed hardcoded strings and replaced them with literals from a
resource bundle.
Updated build scripts to include the locale specific resource bundle
while builing the app.
Merge branch 'master' of https://github.com/rolandzwaga/MakeApacheFlexForFlashBuilder
Merge pull request #5 from rolandzwaga/master

nl_NL locale
Revert to userdebug version to solve the red border
not to contaminate global namespace
Tweaks so audio solution pack meets drupal coding standards.
Made progress on mutate method with BoolOp, Condition classes
Site updated at 2012-10-26 04:26:45 UTC
Update README.md

add travis-ci.org status image
Patched jquery-image-loader
Fixed typo in RuleML document, slightly updated application architecture.
Case study 1, initial document structure.
Fixed another index issue.
Restored the (list-perms) function.
Got the Shared section working and not be horrendously slow.
Taking care of statuses when billing
Revert "cpufreq: Add 1 GHz step"

This reverts commit f4406d6905477c7eaa74fe476a8bd45bd36c81ab.

Revert "cpufreq: Add 1 GHz step" commit. Unstable.
move TM instructions to new page. put joshua options in big table
Removed js.
less leaderboard sprite checklist
Added requirejs.
Merge branch 'master' of https://github.com/kanika1901kapoor/The-Green-Trail-Project into knockoutjs
Added selection.
facebook part
Fix MULTI defconfig
sz: rm setType in Note


git-svn-id: https://source.kii.com/servo/platform/sdk-mobile-client/android/KiiCloudStorageSampleApp@21284 e7cb0379-d053-0e4b-a1ac-43c7dbffadbe
redireccionando a events
manual view error resolved
Working on quicksort exercises, refactored sorting tests common functionality to a helper module
Finished exercises 2.3.18
Added configuration manager checks
Clobber crappy spacing on github logo, and fix header for easy nav
changed some measurements back to mcg

this file is pretty much deprecated for loading data to the database
due to normalization of vaccine_component column...
CNA build.prop editor kang
broke it trying to combine the vos with inheritance
Whoops -x is in the muscle memory
Better explanation and better naming scheme!
Manually removed changes since they didn't seem to want to remove automatically.
removed original github page
added new version of site
fix vibetonz configuration for tab7.7

Change-Id: Ia61dd743242381e62af3e7c7c51acaee77e8304b
Merge branch 'ics' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4210 into ics
Add correct microphone code for PX devices

Change-Id: Ifcfc8748eaabdad277d4407a5c207c6e054fb7fd
mach-exynos: u1-wlan changes to support new bcmdhd driver

Change-Id: I25f7d2624e701679459552cc6998f72d1e57e4c2
Signed-off-by: Andrew Dodd <atd7@cornell.edu>
bcmdhd: Bring in bcmdhd driver from N7000 Update3 source drop

Change-Id: I296aff7b074eb2092d0bfe4b4726980084936907
config: Regenerate for new bcmdhd driver

Change-Id: I853ecf1908f08901ccf7d6dab40709511805e6f8
config: Make MFC0/MFC1 reserved mem sizes match I9100/I777

Seems to fix 1080p video playback.

Change-Id: I956f37321d7c5a68acb0d28b08cec7898bd44c8a
galaxys2 i777: added j4fs module

Change-Id: I4b82cb9b8aa18962910e76d10c6313e3009edab6
galaxys2 i777: lpm logic moved to binary init

Change-Id: Ib50918e245fd0369b9fe91222fde54c3262bd96f
Merge branch 'ics' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4210 into ics

Conflicts:
	drivers/samsung/j4fs/Makefile
	drivers/samsung/j4fs/fsd_common.c
	drivers/samsung/j4fs/j4fs.h
	drivers/samsung/j4fs/j4fs_kernel.c
	drivers/samsung/j4fs/llid_kernel.c
Octopress init
Site updated at 2011-11-20 18:33:42 UTC
Site updated at 2011-11-20 18:44:20 UTC
Site updated at 2011-11-20 18:54:29 UTC
Merge branch 'master' of github.com:sergey-pashaev/sergey-pashaev.github.com into source
Updated the Poster some more, updated the connector for some example
images, removed extra files.
Add vaadin-container-utils 0.1.1
Update about.html

style and language. too much coffee i guess.
cwmmanager removed
More JRuby specific logic, including simplecov for rcov
Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/packages/apps/Settings into aosp

Conflicts:
	res/values-pt/arrays.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ru/strings.xml
	src/com/android/settings/SecuritySettings.java

Change-Id: I2f4233bad41e2a64b104720007760aad3039a72d
Fix mismerge

Change-Id: I5ce249d807bd2a4664d6794cbbcc3e1fbb0bbfb7
Merge branch 'ics' of git://github.com/CyanogenMod/android_packages_apps_Settings into icscm
Minor changes to how scripts and styles are registered then enqueued.
classination!

  * the code is now classy.  for shiry.
Yay, utility is all happy

  * including double-thresholding!
Arduino code for the game controller

  * including beautiful libraries to make it all nice and OO
  * has not been tested!  Need to put in threshold values, which we
    in fact still need to determine.
msm8960-common: update audio header for ion

Change-Id: I3ffabd5dc3f8ec2507bdd686704692bf6399346e
msm8960-common: update ion header

Change-Id: Ie9f28af3820a4a14ff163a47f588291e8784f263
remove LICENSE: no longer applicable
Fixes Issue 4779 - Add Callback example.
Created a repository map in XML.
Parser created for the repository XML map.
Initial set of POM properties defined.
Fix issues related to element wrapper handling
Add exhibitions endpoint
Remove apns-conf because always newer in vendor_cm
disable GENTLE_FAIR_SLEEPERS for better performance Faux123
Update module/Application/view/layout/layout.phtml

Removed unnecessary tag `<html lang="en">`.
Note about forks and i18n
mongoengine upgrade fix for self._meta['delete_rules'] is None
whitespace
add some debug info and phasing to cpcap-battery
Update mdl_smba1002.mk