labofsahil/github-event-dataset-2012 huggingface dataset:
msm_fb: display: add mixer1 writeback buf init call

mdp4_init_writeback_buf call is missing for mixer1 interface. And
blt_addr should be nulled when dtv interface is initialized,
otherwise, mixer1 writeback mode may be false enabled which causes
system crashes or garbage display on TV.

Change-Id: Idbf5fe90eb50f0a68b434f2c76012c64a38553a4
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
msm_fb: display: Add clk prepare changes to MDP and rotator

Use clk_prepare_enable and clk_disable_unprepare instead of
clk_enable and clk_disable respectively.

CRs-Fixed: 351340
Change-Id: Ifb2a9405b8f445a90277d2fade9ab33f5becbd6e
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>

Conflicts:
	drivers/video/msm/adv7520.c
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/lcdc.c
	drivers/video/msm/mddi.c
	drivers/video/msm/mddi_ext.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp_lcdc.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/msm_dss_io_7x27a.c
	drivers/video/msm/msm_dss_io_8960.c
	drivers/video/msm/msm_dss_io_8x60.c
	drivers/video/msm/tvenc.c
Kang "Fix … Bluetooth Autopairing" from prior kang
Add Arathi Hightlands data
Cleaned up WorldLoader a bit, removed the title screen sound, and added .lvimrc
Cleaned up merge conflicts
Merge branch 'master' of github.com:ajstanley/islandora_solution_pack_book
Use backView property rather than backgroundView
* furk feeds support in trakt menu
* searcher now searches in my files
Remove TransactionScope when news are deleting and inserting. Add ErrorController class to log exceptions in appHarbor.
Integrate Boilerplate into _Layout. Add a markdown file in order to detailed the boilerplate features
Add IDisposable implementation for NewsRepository.
Relocate script libraries
Modificate "Html5 + Boilerplate" markdown file
Add JQuery UI related files (script, css and images)
Add code to displays the news on the screen: several script files to handle scenes (statemanager, binder, renderer, formatter).
Changes related to UI visibility. Add scroller to display the news on the first row.
Changes related to UI visiblity. Add a large news to display on the UI.
A little change
Added Test C Program

Added a program which mallocs over x pages (to test
if we catch the faults).
removing some .DS_Store files
test commit
path generation fixed
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>
Merge branch 'master' of github.com:asad/ShortestPathMoleculeFingerprinter
Changes for Redmine 2.x compatibility (fixes #2)

Corrected plugin path and replaced deprecated RAILS_ENV and RAILS_ROOT
constants with Rails.env and Rails.root
Comment and formatting tweaks. @props GaryJones
Polish translation update

Change-Id: If7c9f2078ecb3da9cc27d5660a966eb5689c263b
Merge "Polish translation update" into ics
Update Japanese translation.

Change-Id: I9213e1384a9a5ca9095f1192e817b502619f1c51
Updated German Browser Translation

I hope the translation for "pref_lab_quick_controls_ext_summary" is fine, but I didn't know how to translate it better.

Change-Id: I2f878b4971419abf33ba1249d89e1c6ad2d4fce7
Merge "Updated German Browser Translation" into ics
Browser: Remove duplicate actions from overflow menu when using quick controls

Removed New tab and Bookmarks buttons, and removed Forward when using extended
controls. Left Refresh in as that item alternates with Stop.
Removed New tab and New incognito tab from the nav (tabs) screen, as they have
buttons on the action bar.

Also anchored the menu lower down on the screen so it won't clip with the system
status bar.

Change-Id: Ic320c740ce513d8c687913df1956200f1570300a
Browser: Updated german translation

Change-Id: I5a6b191ceddc314c6551600639013bcf907fbc66
Merge "Browser: Remove duplicate actions from overflow menu when using quick controls" into ics
Merge remote-tracking branch 'cm/ics' into mod

Conflicts:
	src/com/android/browser/PhoneUi.java
respect limiting number of items for collections
Use debugger gem instead of legacy ruby-debug
Implement incr/decr commands

https://github.com/membase/memcached/blob/61cb72e0/include/memcached/protocol_binary.h#L339-L371
added more twitter events
Site updated at 2012-12-15 16:41:37 UTC
Added library files to repository
Changed CMakeLists to account for library files
Updated Readme to include description of runtime requirements
Allow/Reprove/Remove services working
Basic content structure for the site with styling
finished off wordcloud stuff.
swapped location of next and previous pagination links on articles list
fixing typo on front page
Initial Build

simple default express app. make sure to run "npm install -d" to get
dependencies
~Modified 'LOGD', 'LOGI' etc.. to 'ALOGD', 'ALOGI' etc..
Update manual

Signed-off-by: Tong Huu Khiem <tonghuukhiem@gmail.com>
Site updated at 2012-07-03 17:46:12 UTC
Site updated at 2012-06-30 14:04:44 UTC
javascript time
Updates ticket_route table and now checks if the user can buy a ticket
added slimbean setup
動機風雲25262728
- Agregando enlace a documentación en wiki
Refactor and add note for lady
Moved Group Folders into the doc folder
Refactor navigation css
modified:   LCCD_core.sh
	modified:   README.md
Fixed tab size quirks in Firefox once and for all (border-box)
add setting array to filter a top command
add test coverage validation to CI
add testing coverage part to CI configuration
Merge branch 'master' of github.com:laradiodelsur/laradiodelsur.web.policy
fix marker file name
Regen update.
Fixed a bug which prevented valid server names containing a reserved world.
Added tests for invalid and edge case server names.
Changed a directory test to look specifically for a directory.
Added a test for creating duplicate server names.
Added test for deleting a server that does not exist.
Added comment sections for all interaction points.
Moved test function to correct section.
Improved server creation to not require the "minecraft" jar group to be present.
Added explanatory exit codes to the script.

These codes are used by `test.sh` to better analyse whether an action
was successful or not.
Added helper functions which set variables for script tests.
Added a test for deleting an existing server.
added post on everyone gets drunk in december
bumped version to v0.0.2
Fix JS error in store
增加创建对话串和对话，整体流程写完，有BUG，周一继续
multiplestests
update README git url
Add config.ru to make the project run on Heroku

Taken from https://github.com/indirect/middleman-heroku-static-app/
Settings: add link to theme app

icons by Adhvanit

Change-Id: I639f2e9499aa12e76ffd0eb761032751eb190931
Merge remote branch 'upstream/jellybean' into jellybean

Conflicts:
	res/xml/settings_headers.xml
Change text of save button on saving/modification.
Extension state is now cached between runs

Now only changed files will be written to disc. While this reduces
generation speed, it vastly improves synchronization speeds that rely on
file timestamps.
Add missing task partial for minuting a general meeting.
Merge branch 'coop' into dev-coop-oneclickorgs-com
Bild Konzernstruktur eingefügt
Add set redirect url
First post! Hashie and Rspec
Added beer shapes demo.
Configured NGINX to proxy to Puma
update ext4/jbd2 drivers from linux 2.6.35.14

Change-Id: I476e3e8abb4bb6ffb430f71bfbd885e15dea8faa

Conflicts:
	fs/ext4/super.c

Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Added a delete method for ORM objects.
JSON-encode the value.
Renamed the _lock function to lock and the _unlock function to unlock.
Setting the keep_alive option.
30 second keep-alive.
Belongs-to relationships should work.
Removed git sub modules file
"Reklamefilm" i in one word. Fix camel casing and spaces in everything
Update reklamefilm license
Add reklame file metadata stream
Better label for content model
Exactly one file per metadata blob
Descriptions as textareas in GUI
Don't give policy mimetype of RDF
README update. Version fix.
code mirror 1
remove seemed useless gralloc_open() call in fb_device_open()

Change-Id: I520e460bd558934c71042b5a4fdb03b3935ad720
Signed-off-by: suyi Yuan <yuan.suyi@gmail.com>
Revert "Merge omapzoom hwcomposer support for omap3 when using OMAP_ENHANCEMENT"
Add overlay header
libhardware: Don't always include set_fm_volume

 * Stop breaking mah ABI!

Change-Id: I1ee7c41b764c72a6780c5990390ce5377b4780f8
Merge remote-tracking branch 'upstream/ics' into ics
gps: ipv6 support

gps.h - AGPS to accept ipv6 addresses

Change-Id: I1e5332afb510f688dd029dc1dda7fc7e9b8ff0ec
Merge branch 'ics' of github.com:CM9-D2G/android_hardware_libhardware into HEAD
changes to make the importer work
Homework Type and html my web
Made the toolbar thicker
Merge branch 'master' of https://github.com/thingtrack/konekti.view.layout.toolbar.git
add test to detect game win
detect dead zombie
refactor zombie into a common var
refactor zombie is dead into a method
refactor by adding a method to check if a plant is dead
refactor by adding a method to check if a plant is dead
detect plant is alive works
refactor into method zombieIsAlive
red: plant fires a projectile
green: plant fires projectile
green: dead plant cannot fire projectile
red: projectile hits zombie
green: projectile hits zombie
red: projectile cannot hit dead zombie
red: zombie bites plant
green: zombie bytes plant
red: zombie should be near plant to bite it
green: zombie should be near plant to bite it
refactor: zombieWon function
make tests pass
Switch to new Motorola Wrigley 3G RIL

Change-Id: Id3daabad5e171e7e8dd429022edbe3662801d562
libsensors: use /proc/socinfo to detect mb526 kernels

Change-Id: Iae63f37ae831dbd86d652876156779d4cbab772f
Help-text for sms
Ignores old reservations when processing sms extension requests
Fixed problem where sms commands could not extend an ongoing reservation
Added authorization for sms reservations from drivers mobile
working on new blog post on licenses
Fix for bug 42251: Work around JS HTML5 treebuilder bug

* As documented in the [BUG 42251] bugzilla ticket, the treebuilder
  doesn't recognize upper-case tags.  Rather than downcasing the,
  input tag, it seems to reject "unrecognized" tags (but only for
  end-tags?)
* In any case, this patch works around this by sending the treebuilder
  library lower-case tag names only.

Change-Id: Iabc60505984999d4095650e27657c74eb6ca7080
Merge "Fix for bug 42251: Work around JS HTML5 treebuilder bug"
Propagate the maximum child dsr to the parent in the DSR calculation

Children should always be contained in parents, so this is an improvement
until we get a full ltr pass.

Change-Id: I7367d7a3968ea301e9b4ff27413be914a43e48c3
Merge "Propagate the maximum child dsr to the parent in the DSR calculation"
[maven-release-plugin] prepare release bamboo-liverebel-plugin-2.5.2
Added test for tnn_pstable
Revert "Revert "bnn""

This reverts commit a36f439b9902f79deacc27473c362c68f94db941.
Revert "Revert "Update musicPlay/Music/Music.h""

This reverts commit 3716b9fb74e17161696c1b0819c6ef813eb04b5b.
Revert "Revert "Update musicPlay/Music/Music.m""

This reverts commit de335a915d55b660894f53a7e71d1de26ac6ad8e.
Revert "Revert "add two file""

This reverts commit a38b553ae0479381927123891a8920e623b8fb02.
Collected performance data on the algorithm prototype.
Black background.
Add custom black gradient
Remove instance check as scrollbars are already in Scrollable
Fix top index adjusted wrongly in Table#adjustTopIndex

The subtraction of 1 is only needed if less than one row is visible 

384589: [CellEditor] Wrong row is edited when last row is visible
https://bugs.eclipse.org/bugs/show_bug.cgi?id=384589
Implement custom GridItem height

See Bug 383524 - [Grid] Support different item heights
Also adjusted scrollbar automerge activation, so grid works better
on slower gecko browser
Fix top item index adjusted wrongly in Tree#adjustTopItemIndex

The subtraction of 1 is only needed if less than one row is visible 

384589: [CellEditor] Wrong row is edited when last row is visible
https://bugs.eclipse.org/bugs/show_bug.cgi?id=384589
Configure/render grid columns before grid appears

See Bug 384792 - [Table] Header disappear when it's layouted in
invisible TabFolder tab.
Refactor Table_Test class and top index tests
Revise exported packages

* Add missing exported packages
* Add missing version numbers

See bug 384816: Add version number to all exported rap packages 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=384816
Fix the error message in SimpleLifeCycle#sleep()

382307: Improve exception message: SimpleLifeCycle does not support
Display#sleep()
https://bugs.eclipse.org/bugs/show_bug.cgi?id=382307
Update all RAP feature versions to 2.0.0

* Update the versions in the feature.xml to 2.0.0
* Adjust the versions in the pom.xml files
** Update to new version 2.0.0 in the parent pom
** Add new 1.5.0 version element to existing bundles
** Update all category definitions and other p2 related files
* Use released Eclipse 4.2 base platform instead of RC4 build
Add javascript nature to bundles containing .js files

This enables some features in JSDT.
Fix combo selection glitch related to mouse and keyboard events

See Bug 384441 - [Combo] Wrong behavior with arrow keys 
Add resize listener to CoolBarManager#coolBar

378752: Missing ToolItem and ToolItems Not Correctly Sized
https://bugs.eclipse.org/bugs/show_bug.cgi?id=378752
update README with link to Getting Started page
Update notes for submitted changes

* satsuma: recovery mass storage support fix
hnl_dk: Fixed the HOME key for the satsuma. Tested by Dejan: http://code.google.com/p/freexperia/issues/detail?id=571

Change-Id: If3d4766ee4aba90a6824b8e0e17fb6a64245a74f
Update notes for submitted changes

* better RDS info handling
Update notes for submitted changes

* complete removal of deprecated presets implementation. small main UI refactoring
fix lockscreen low battery percent

Conflicts:

	policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
Created and felt like publishing this. I dunno why, I just like creating reposities..
修改了打包过程
Added 3 button
Update notes for submitted changes

* Reorganize status bar settings menu (2/2)
am: Don't crash if cacheDir can't be created

 * Due to a bug in the multiuser code, it's possible for us to reach
   here by loading framework-res for a different user in which case the
   cache dir can't be created.
 * Add a null check to avoid the crash and subsequent lockup of AM.

Change-Id: I12f3a207d9fa0111286a67e29652f808ad5d9410
Merge "am: Don't crash if cacheDir can't be created" into jellybean
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_frameworks_base into jellybean
SR5 kernel update
Fixing minor issues in singleton section
added yui dependencies
Merge branch '6.x' of github.com:ajstanley/islandora_solution_pack_video into 6.x
Основная часть перевод закончена
Indent documentation
Updating readme to understand how to use the project.
Merge pull request #2 from nbauernfeind/master

Update readme with a usage example.
Added support for Drop Shadow, S3Reader and RemoteReader plugins. Updated web project to latest version of ImageResizer.
Finished for now...
Removed all dependencies on localhost, tests briefly. This should be tested more thoroughly.
Initial commit.  Still needs QUnit tests and other stuff probably.
Fixed nextSessions to be picked up correctly
Homepage slider simulation
Fixed jqm list-divder to test data-theme attribute first
Corrected list-divider
Resize the unlockable view to fit the interstitial images
Rm old global activities query: not being used anymore
Remoção de arquivo duplicado.
add version.php
Merge pull request #24 from thedannywahl/add-version

add version.php
added main counterfactual function
added negate formula function
Adding expanded packages to source, script to build archive
Some readme updatse
ditto is Mac-centric.  Using zip for archiving.
Merge pull request #6 from forcedotcom/expand_packages

Expand packages
Fixes: #619 show opsi based clients should be removed ?
Installing cython in advace
Merge branch 'hotfix/cython'
Proposal: matchAny
Reindeting library code
minor fix to tt_report (don't crash if user was deleted anymore)
minor fix to visible scope on TimeLogs
Adding a new page for statuses.
Added support for monger.
Added the logo to the status page.
Setting up zookeeper clavin support so that the db can be connected with loaded properties.
Modified configuration settings and called load-configuration during server start.
CORE-3068: Updated MyDataWindow folder creation to behave similarly to previous changes made to File Select dialogs.
Revert "fixed mms"

This reverts commit 099091e13d1794173ef5222b3146448329a04c69.
Back to the older style, with the new Google Play Music controls, the fancy
style is no longer needed. A simpler approach is now the best option.
Add displayOptions support to SetPaymentOptions request
Add receiverOptions support to SetPaymentOptions request
Fix README typos
Add basic documentation for #build_adaptive_set_payment_options_request to README
Merge pull request #19 from herimedia/more-set-payment-options

Add displayOptions and receiverOptions support to SetPaymentOptionsRequest
erste Python Aufgaben
Generate new entities and proxies
ignoring php~
Revert "Styling README"

This reverts commit 9ccf9d3cf7a6cc20dc99ae86aa8bfd26b83c72f0.

Conflicts:

	README.md
Add configuration
...
...
Merge branch 'master' of github.com:vala/content-preview-python-server
Initialize default Quartzite scheduler before running tests
Migrate to Leiningen 2
Added further level of abstraction to index. Now has a generic-powered abstract Index class. Added timer to main, should be used for autosaving index in intervals. Good progress.
Add base flask app with a bit of routing
Convert static site into app
Add macro for nav links to highlight active nav item
Add icons to nav items
Add Flask-Assets to requirements.txt
Add flask-peewee for admin / db access

Convert gallery and detail view to pull content from DB
Remove unnecessary images
Update requirements with flask-peewee
Remove duplication of main image between Piece and PieceImage

* Rename cover_url to url
* Update detail template to use piece.url as active item in carousel
* Update gallery template to use .url instead of .cover_url
* Remove print statements
fixing unit tests, updating gitignore
Use <hr>.
activerecord.rb: arel_attributes_values make compatible with rails 3.0
FileNameGenerator is abstract class now (instead of interface).
Refactoring (FileNameGenerator, ImageDownloader).
Fire ImageLoadingListener callbacks if "imageUri == null"
Changed API: Removed DisplayImageOptions.transform()
v1.5.5 Update Readme
ADDR-56: searchAddresses should support accented characters
Merge branch 'hotfix/10129833' into develop
Adding SEO Ultimate plug-in
Merge branch 'develop'
Initial commit
Improve the README
Add StaticPages
Add About
Finish static pages
Solve exercises 5.3
Use PostgreSQL database for development and test
Add Guard and Spork for tests autotomation
Add example_user test class
Finish layout and routes
Rewrite static page tests, check links navigation, remove duplicate method in test
Make a basic User model (including secure passwords)
Finish user signup
Add SSL in production
Solve exercises chapter 7
Finish sign in and sign out users
Add Cucumber BDD tests
Update testings
Finish user edit, update, index, and destroy actions
Add user microposts
Updated Graphene Theme URL
A few ediff faces to override ugly defaults
Makefile update
Added some governors for tests
Basic doc clean up.
Release 0.7.1
Added automplete responsive
Adding datetime to message
Adding item to readme next features
Updated temasek defconfig
Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Settings into aosp

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I5e1058d89790be87ece1e72425f47885b006a0c0
settings: Fix dithering summary not showing up

Change-Id: I484598c14b86690f4460f7f2240370318da8af53
Merge "french: all strings from ics" into jellybean
ProfilesSettings : Don't reinstantiate

Since the fragments state is preserved in the backstack, don't reinstantiate view.

Change-Id: I0b07585fe1b41aca1faf18698b7b03e857a0b5fb
Files conflict with Project vwf-public
de.po: fixed ERROR: spaces at end
django.po: fixed some grammar
Localisation updates from http://translatewiki.net.

Change-Id: I61b21fd50ec0273ff348643402da47108421799c
update client example settings

Change-Id: I3e2b383fe067f754ee1be0c7d02808f3598b1d3f
Merge "update client example settings"
better organise the imports
Added cpu argument to ForkBlur.
Added Fibonacci examples with thread pool.
CSS breadcrumb
mainMenu edit
db
Site updated at 2012-05-10 18:04:47 UTC
Fix link to NoSQL episode
Working on abstracting the header title into functions.php
Update hp.html

add rss for tumblr
Fix recipe links
Tamir changed the hp title again !!!
d2mtr:switch blob locations

Change-Id: I92eca2e43ecb0e808c50ec6032ad1568d503c027
i9300: add bluetooth build config

Change-Id: Iea01fbf70eee99a09c80f0dd4ae8c686e39b18f1
i9300: use SamsungExynos4RIL class

Change-Id: Ia920e4e4193513308ac8f0af7e2c2009d3bc20c8
(mach-tegra: clocks) & (sound: soc: tegra): fix playback with screen off

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:

	sound/soc/tegra/tegra_pcm.c

Change-Id: Ie03941e381ec27619ea5e7994efec51ca2140032
Merge "(mach-tegra: clocks) & (sound: soc: tegra): fix playback with screen off" into jellybean
Update notes for submitted changes

* config: enable zram and swap
Polish translation

Change-Id: Icc91fe3c4bf22137ca8a16a7e55f94ca2fc9cdb3
Merge "Polish translation" into ics
Minor Changes SD Debugging Printf
Renamed rel
Defining indentation policy for Vi.
added gitignore file for _sites
renamed package and cheat database core package
Fix Http Live Session Conflict
Typos, damn typos, following me everywhere

Change-Id: I98eab7c064388a6cf4db31aaee42be6940ab8eb9
Adding requirements.txt file
Fixing threading in tests

Thread is now getting closed, when tests has run. But there is a problem with the
SimpleHTTPServer and POST/PUT requests. Can't check input, not supported by it.
Small clean up
adding extra test to ensure login
Merge branch 'Stabilize_Selenium_FF_Driver' into develop
Adding mail error messages

Adding a simple way of sending a mail to someone, this should infor about problems.
Added Cash Point model, service, tests, hibernate scripts, and test data.
	- Updated the bill to require a cash point.
Created the timesheet entity, service, table, hibernate scripts, and tests.
Quick edit to timesheet model.
Merge branch 'feature/auditing' into develop
Merge branch 'develop' of github.com:OpenHMIS/openmrs-module-openhmis.cashier into develop
Fixing relational paths.
Merge branch 'master' of github.com:Polytechnic-University/MitosEHR-Official
Fixing relational paths.
merge in jb-mr1-release history after reset to jb-mr1-dev
Act on no-prefered-apn-on-connect config option.

bug:7306353
Change-Id: Icf1c21cc8997821a7d50d114c8985728d9bdb02e
Revert "Act on no-prefered-apn-on-connect config option."

breaking jb-mr1-release

This reverts commit 3ff47ff70406e6973226ac966d157a97fa8e9279

Change-Id: I897cc6eecaa0b4a3d248abda0431cd70742ad2df
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
Set audio mode after accepting the call

Set the audio mode to incall immediately after accepting the call and not wait
till call is reported as ACTIVE by RIL. This is done to speed up time taken for audio
to set up the voice path

(CM change: Remove calls to Rlog, since we haven't imported that yet)

Bug: 7612431
Change-Id: I8008edc64928016ab94aa6d770de248b5d85dc93
Fix ringing audio focus handling.

Test case:
- enable increasing ringtone starting at volume 0
- start any music player
- get an incoming call

Previous behaviour:
When ringtone volume is increased from 0 to 1, music continues playing
even
though ring tone is playing as well.

New behaviour:
When ringtone starts, music is attenuated to make user aware of incoming
call. When ringtone volume is increased to 1, music stops playing.

Change-Id: Ifc32ea162d4527572be0574024116d10ee9bca66
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/opt/telephony into aosp
Merge remote branch 'cyan/cm-10.1' into mr1-staging
Forward porting CM7/CM9 Advanced Phone Settings

Forward porting the following Advanced Phone Settings from CM7/CM9:
Vibrate on Answer
Vibrate 45
Vibrate End
Vibrate on Call Waiting

You can find these options in Call Settings
See ics commit: df07cb2f0e065c2fa87b6bfb4857098f7cc5df94

Fixed commit message as well as white space issues

Patch Set 6: Rebase
Patch Set 7: Correct errors according to comments
Patch Set 8: Add NL translation suggestions

Change-Id: Icaeb796850d2e5bca4367eb7a655dc977ea79e28
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Phone into jellybean
fix for telephony-common
Edited freeglut instructions to get rid of program files\ reference
Implemented few more functions in the JSR 107 API
Added CacheExpiry task
Add jenkins.sh
Ignore .bundle directory.
Update Gemfile.lock
fixed modules b/c of new subdirectories
Added local-audio-recorder by MaxThrax.
skins: This about window is not anywhere accessible and besides that says nothing about the origin of the plugin.
Added disk insertion / ejection detection in graph, pie and bar disk items.
screenshots yahhhh!!
Site updated at 2012-11-24 20:30:11 UTC
Improved schemas and seed process
Removed node_moduels from git
Updated frontpage reviews to pull from server
Added dynamic league table to index
Added dynamic league table to index
added bootstrap
basic template from bootstrap
fix to url in info.xml
Fix formatting in Ember.Select
Bump to engineyard-serverside version 1.6.2
support for rebooting to download mode for cm9 and clones
Revert "support for rebooting to download mode for cm9 and clones"

This reverts commit 58e2e2989d52ed37bc62d6021ca59b7168d1594d.
charge current interface
disable mali state tracking
mali 3 step mod
gpu voltage, clock and stepcount interfaces
SLQB memory allocator
remove ARM based old sha-1 implementation
missing files for xz compression
prevent freqs going above max policy - by netarchy
cpufreq: be sure the cpufreq notifier is called last
The cpufreq pm notifier also sets the cpu to 800MHz (imposed by the
hardware) to suspend the device. Be sure it is called last when the
system is going to suspend, so the cpu doesn't need to spend too many
cycles at 800MHz unnecessarily.
originally by Andrea Righi (@arighi)
lower allowable minimum GPU voltage level
remove unnecessary commit
bln support for samsung roms, from creams
brightness curve (line actually) mod
currentwidget support based on Entropy512's commit in his GB kernel
CONFIG_TINY_SHMEM
CGROUP_TIMER_SLACK
cpu overclock, undervolt, some interfaces and scaling fixes when having unsafe high frequencies.
forgotten initial low and high cpu settings and gpu/cpu underclocking option for future use.
updated css, not final yet
updated index.html, not final yet
capturing gestures according to jester..to be checked/fixed in order the pinch/stretch to work 
updated, almost final, until around step 6 of issue #15 (without pinch.stretch)
an icon for the close button in settings view
Site updated at 2012-06-09 23:24:30 UTC
Refactoring the posts backend, adding post list and find by id
Added a few functions to Vector.js
Removing processing.js dependencey
Update 00001

Trying to make the bullets not follow creeps (they are not heat seeking)
Added examples for adding and viewing metadata
Updated the .gitignore.
Changed the json body handling so requests without content-types are handled better.

In other words, prov-proxy shouldn't crash because of missing content-type headers.
Más con los temas
Arreglando TBG, subiendo prevs
Fix

width en radio
Command Prompt is finished. Everything seems to be running smoothly now. Added makefile for submission.
First import
First commit
Provide working example of submodule routes

Also ran into an issue with pulling in the submodules as jars, in the
Build.scala (core) file you can change to pulling in as SBT dependency
and that seems to fix the issue
Finer experiments
Adding the Authorinfo + now really adding the JS File in the Header :-x
Also finish download in case of RESULT_CANCELLED, onCancelled wasn't
called in that case.

Change-Id: Ie02cc4319d27a75ae116cac1c235ca5317a8d65d
DownloaderMetadata changes actually save ;)
update my profile a bit
Attempt to serialize a shit ton of rigidbody moves over networking
fix #412
fix #413
fix #407
simplified code, this was a bug in jquery 1.4 ... heh fix #409
Merge remote-tracking branch 'baseSource/master'
Site updated at 2012-11-13 00:54:08 UTC
suck it vancouver
Script for generating report on recent hashtag usage.
v1.0.1 corrige probleme listmap
lets check git!
moving layout to separate files …
moving layout to separate files …
yo
Merge branch 'master' of https://github.com/rdp/virtual-audio-capture-grabber-device
new name
Build is a string parameter, not a number
automatic 1.3.4 release
Updating the development status
automatic 1.3.5 release
merging
Removing dependency on our own PHPUnit, this is way too expensive
Site updated at 2012-11-03 15:16:58 UTC
Find Next Result button to accompany live search
new post and buttons
Site updated at 2012-05-05 14:52:16 UTC
Change author email and add some example code
ajustando google analiticys
Merge remote-tracking branch 'origin/merge' into experimental
Fixes Issue 2825 - Add note about C anon struct variables.
Notes creation process completed
Enabled 256k stream quality in config
Add init.d script from nadlabak to try to prevent us from having to unplug and plug our device into usb
More cleanup with additional bug-fixes
Did some html formatting. 'cause I'm like that.
A little CSS formatting
Added SEPTA bus and trolley layers, and popups for longer data lists.
Merge pull request #1 from reedlauber/master

Added more SEPTA data  //thanks Reed!
Add Unittests and Comments
Fixed framework building, added task comments.
Added test project
build msm-buspm-dev.ko within kernel
Update Build Fingerprints (LI4)
Correct spelling errors that escaped
Correct spelling mistake
Merge branch 'bug_spelling'
Adding raw csv data.
Added JSON data and README instructions.
добавлена обработка включения/выключения окошек
smba-common: jellybean wpa_supplicant fix
I'll do this shit all day long. FML
Revert 2a1d0d5

It's in the wrong branch and screwed up line endings
Merge branch 'master' of github.com:adriaan-vd-graaf/Inne-en-Adriaan-400pheno
functie zet nu streepje, ipv no pref
De null dingen eruit gehaalt
Skript zu Entwicklungen nach Legendre-Polynomen hinzu.
Nice errors when product of country is not found in database
Add NTP rule to UFW.
List of Shakespear chapters in tabs
Add SQLite helpers classes
renew the size of image

includes 8.3.rest.png and 8.3.rest2.png
renew the size of image

8.3.rest2.png
Merge pull request #90 from wenlei/master

renew the size of image.
Renamed nova-start
Merge branch 'master' of ssh://github.com/beloglazov/openstack-centos-kvm-glusterfs
we don't want nfsd to appear in disk list - take 2
Extended the handle size for the green bottle so 8cm

The handles on the green bottle were not big enough. Changed them.
Fixed line lengths
Added calls to AuthSuccess / AuthFailed
Removed icons + main layout. Added error messages
Changed exception handling in case of oauth service not registered
FIXED: Added dependency to readme
BUGFIX: Wrap jquery properly so as not to clash with prototype
Merge branch 'stable24' of github.com:gordonbanderson/Silverstripe-Links-Module into stable24
jeepers!
p1-common: Add power HAL

Add support bits for power HAL to be included from s5pc110 common

Change-Id: I2058107d90cb25afe1d309e56221de72fdbf1802
more stuff to common
Changed command line argument requirements to be "key=value"
Added requiretile=true|false to TmxToNntx/Program.cs as an optional parameter to allow large single tiles to go on the ground layer and still get nodes.

Made extra command line parameters case insensitive
theme updates

Signed-off-by: Corey Schneider <mynameiscorey@gmail.com>
Merge pull request #3 from pad92/master

Fix include paths
Merge pull request #4 from pad92/master

fix broken html error page
Merge pull request #5 from pad92/master

Merged pad92's improvements
Adding ESI support
Merge pull request #6 from ThijsFeryn/master

Adding ESI support
Merge remote-tracking branch 'upstream/master'
- ‘simt.bib.bak’
Merge in modifications for adding mark all read button to message panes. Also adjust security to signatureOrSystem for provider to allow cross-device install.
Added README
Fix a few loose ends
remove whitespace
Merge branch 'master' of https://github.com/presidential-innovation-fellows/FormTimer
Commented out the unnecessary console print out
Convert hg to git.
update from XXKQI
Test interface, only pull in new and processed totals not full lists - would otherwise crush the browser under an immense DOM
Setting default test queue type to filequeue
Localisation updates from http://translatewiki.net.

Change-Id: I7ba6e43fd9f5abdbd8ee9276631a3184cb75bf8a
Localisation updates from http://translatewiki.net.

Change-Id: Ica969106c13dc2a5db1e94aea3afe7582e425c4e
Localisation updates from http://translatewiki.net.

Change-Id: I421a27fa7346eafe4a26260b0c0544af0d973798
Wrap native language name with a span and add a lang attribute

Should be useful for all kind of font vodoo and screenreaders

While I am in these lines:
* Use word-separator message
* Use parantheses message

Change-Id: I176269a2a7c8fa4ac4cfcdd24e4e86e9a4471a45
Merge "Wrap native language name with a span and add a lang attribute"
Revert "Trimmed the branch to only the ecl_slam sub directory"

This reverts commit ef7132a7f6331c2460a39f25db07ebfd6225ea1c.
Rebase from 'upstream' @ version '0.50.2'
Trimmed the branch to only the ecl_slam sub directory
Fix filename.
Add integration test.
Add cast.
Bump version.
Merge branch 'release/v0.1.2' into develop
Class MySQLRandomElements finished
Update notes for submitted changes

* Added hungarian translation for Unknown Call Type
Settings: Fix stylus gestures settings and related NPE

This commit fixes two things:
 - The stylus settings category was not removed on non-stylus devices
 - Include all stylus gestures related preferences in the PreferenceCategory
 - A missing null pointer check caused a NPE when IME selector was triggered
   Issue 6503: "Set up input methods" crashes the Settings application

Patch set 1-2: Initial commit
Patch set 3  : Change variable name to better match category name

Change-Id: I6c0a746b33c4a86b977f443233ed79d626859495
Merge "Settings: Fix stylus gestures settings and related NPE" 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
Fixed non translatable values

PatchSet 3: Deleted dependencies

PatchSet 4: Rebased

Change-Id: Ic0e03f4ff23ffdafc0c1dd813cff593c1f615c07
Try to remove peristent cache
A bit further forward with PlayReady
WIP: fix leaks with closure vars
Merge remote-tracking branch 'upstream/master'
Fix nav.aEvent
Rename some vars
Merge pull request #215 from Y0ba/master

Устраняем утечки памяти
More changes & adding 3rd function
More changes & add 3rd function
Added a format flag to output data to csv or npygz
Site updated at 2012-11-06 08:49:28 UTC
Published module in npm
TOC for README
Updating with localization and warning if using own WP
Adjusted right margin for the note title.
No need for excludes.
Removed toKill array of nudists.
change earningpotential to show correct value
[maven-release-plugin] prepare release de.flapdoodle.embed.process-1.22
For the MT
Add support for CKAN 1.7 date format

In addition, only convert to local time if the
time has not be converted to local time when parsed
Provide support for package format provided in search results in CKAN versions > 1.5

Update remains backwards compatible to 1.5
Extracted pattern from song
ShowAllProducts, fix internalFrame
fixed silly tagline issue
Updating lifecycle documentation to reflect attach/detach/updateconfig changes
began parametrization of filter
Font and background changes.
Merge branch 'master' of github.com:phillro/node-express-jquery-socket-handler
Added utility methods.
Merge branch 'master' of https://github.com/selfservices/codecamp-2012-tallinn-android
Make rejected cats small
增加结构树页面
Edit summary text

Steamline the summary text so it is shorter
GPU OC/UV support, CPU OC/UV support. USC GS2 support
Fixed last compareKeys memory leak.
Localisation updates from http://translatewiki.net.

Change-Id: Ib4c744a2ac4999171fcf1974993cb0da8a879ddd
Localisation updates from http://translatewiki.net.

Change-Id: I216b1440e244d69dbff756196d0f7bd296f41c6c
Localisation updates from http://translatewiki.net.

Change-Id: I10ce31d18c70b79b39eedabee0a2943cbf02c335
Faster and more efficient
Add correct microphone code for PX devices

Change-Id: Ifcfc8748eaabdad277d4407a5c207c6e054fb7fd
Update notes for submitted changes

* CMUpdater: Dutch translations
CMUpdater: Dutch translations

Change-Id: I5bffe60b5273b57bb007d3934058243761b55907
Triangle Conversion

Added in the Triangle classes based off of the Pascal ones.
Update arch/arm/plat-samsung/include/plat/regs-sdhci.h
load the correct jni library for panorama

Change-Id: I04d077fbeb500e705b0408c6575470b0d416628c
Prettyficated the search form and navigation links
Introduce vibration options for voicemail notification

Bug: 6014374
Change-Id: I1e0dff2e958b804e140b2d0d1d286f3392efecd1

Conflicts:

	res/values/strings.xml
Fix in-call notification icon flicker when screen goes on/off

We currently suppress the "in-call" status bar notification if the
InCallScreen is the foreground activity.  This helps reduce clutter in the
status bar, since it's already obvious that you're on a call.

Unfortunately, when the screen is off (like when the prox sensor is
active), the InCallScreen is technically not the foreground activity, so
we *were* enabling the status bar icon in that state.  This was causing a
brief flicker of the status bar icon any time the screen turned on during
a call (like when pulling the phone away from your face.)

The fix is simple: just suppress the notification when the screen is off.
This way the transition from "screen off" to "InCallScreen in foreground"
doesn't cause the notification to change state.

TESTED:

  - While on a call, with in-call UI visible, trigger prox sensor several
    times
    ==> no glitches; icon is never visible.

  - While on a call, bail out to Home screen, then, trigger prox sensor
    several times
    ==> no glitches; icon is steadily visible whenever the screen is on.
        (Specifically, this test shows that this CL has no effect if some
        other app is active.  That's because once you bail out of the
        in-call UI, the updateInCallNotification() method doesn't even get
        called when the screen goes on and off; it's only called for phone
        state transitions, or when the InCallScreen gets paused or
        resumed.  So the notification remains enabled the whole time.)

  - Launched an outgoing call
    ==> no glitches; icon doesn't appear at all (even as a brief flicker)
        during the transition from the dialer to the InCallScreen.

  - Incoming call
    ==> no glitches; icon is visible while ringing (which is WAI),
        disappears cleanly when you answer the call.

Bug: 6021909
Change-Id: I43625f4f69ce75c662c211dadc7292fb14641073
Setup a flag to detect when the screen is on and we are in call mode.

Fixes b/6029570 Proximity turns screen on and off repeatedly for no reason, when device is flat

Change-Id: Ie727dd779bb957cd6da948dbe1584a4382d9935a

Conflicts:

	src/com/android/phone/PhoneApp.java
Import translations. DO NOT MERGE

Change-Id: I5753adbd0904a4c9ac3d8780421ef773fd67909a

Conflicts:

	res/values-fr/strings.xml
	res/values-ko/strings.xml
	res/values-nl/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml
Correctly hide in-call panel when dialpad is shown

Cherry pick of Ia673f7c08abfdf240c792ce6a457c743f0db0b8e

Fixing issue 5497680 Device shows background Incall screen for
fraction of sec in DTMF call pad screen, if power button is turned
ON.

We're calling setInCallScreenMode(NORMAL) from onResume(), which
should take care of dialpad status correctly.

Bug: 5497680
Change-Id: Ib8346cfd5b1c98190d66603b24ceddf234754496
Czech translation for missing strings.

Conflicts:

	res/values-cs/strings.xml
Création de projet
Merge branch 'master' of https://github.com/LouisBanvillet/TraitementControleDePresence.git
allow java larger heapspace on rombot
remove sensors.solana now built from source thanks for XDA user jarveson

Change-Id: I49e0e72fa292105d5296de56404a73886e7cc425
Update to 5.16.211 blobs
Fix build with qcom hardware set.

This fixed broken build introduced by 01d30629e.

Change-Id: Ia8f6ff550da19da3881c5e558e9d56db2278b789
Remove preference to override path - handled globally
version (0.1.0) for Redmine +2.0.x

Fixed plugins paths to css and js and others adjustments:
- Removed @PluginFolderName from ApplicationController
- @PluginFolderName set at _contentHeader.html.erb
- Changed the call of date to html_safe on mgmt_time _scripts.html.erb
- Deleted renato_controller.rb
Adding the temp storage facility to menu service
Fixing windows build by escaping the quotes around the -D parameters passed to cmake

Reviewed by: Eric Pearson <epearson@rim.com>
Tested by: Eric Pearson <epearson@rim.com>
Added missing install target for BBM library

Reviewed By: Jeffrey Heifetz <jheifetz@rim.com>
Tested By: Jeffrey Heifetz <jheifetz@rim.com>
Changing how the PushStatus constructor is used, since it will be changed to an explicit constructor

Reviewed By: Eric Li <eli@rim.com>
Tested By: Eric Pearson <epearson@rim.com>
Adds support for default pickers for file picker and camera.
Adds manual tests.

Fixes issue blackberry/BB10-WebWorks-Framework#150
Fixes issue blackberry-webworks/BB10-Webworks-API#27

Reviewed By: Igor Shneur <ishneur@rim.com>
tested By: Igor Sheneur <ishneur@rim.com>
Added name, IMSI and IMED to system and identity extensions.
Added unit and functional tests for IMEI, IMSI, name and got rid of whitespace
Added tests and changed format of functional tests for name, IMEI, IMSI

Fixes issue blackberry-webworks/BB10-Webworks-API#41
Fixes issue blackberry-webworks/BB10-Webworks-API#42

Reviewed By: Eric Li <eli@rim.com>
tested By: Igor Sheneur <ishneur@rim.com>
Added support for font events, and exposed getters for font name anf family.

Fixes issue blackberry-webworks/BB10-Webworks-API#36

Reviewed By: Eric Li <eli@rim.com>
Tested By: Igor Sheneur <ishneur@rim.com>
Fixing the word-wrap in the dialog

Fixes issue blackberry/BB10-WebWorks-Framework#215

Reviewed By: Eric Pearson <epearson@rim.com>
tested By: Eric Pearson <epearson@rim.com>
Updating context menus to better match the UI specification.

Reviewed By: Erik Johnson <erjohnson@rim.com>
tested By: Tracy Li <tli@rim.com>
Implements PIM Contacts specified in blackberry/BB10-WebWorks-Framework#164

Reviewed By: Eric Pearson <epearson@rim.com>
tested By: Smita Pillai <spillai@rim.com>
Fixed URI component encoding/decoding for event

Reviewed By: Jeffrey Heifetz <jheifetz@rim.com>
tested By: Tracy Li <tli@rim.com>
Addresses issue blackberry/BB10-WebWorks-Framework#168 sync with native iF

Made the following changes:
1.Removed server side whitelisting of requests in invoke API.
2.Mapped target_type array property in query request to target_type_mask.
3.Updated webplatform hash to include invocation changes.
4.Automated functional test for querying the iF

Reviewed By: Eric Li <eli@rim.com>
Tested By: Igor Shneur <ishneur@rim.com>
Merge remote-tracking branch 'origin/next' into next-pim-calendar
Fix functional test lint errors and added waitsFor to .jshintrc predef list
Added check for access_pimdomain_contacts permission on index.js; Moved S4() and guid() to lib/utils.js
Merge branch 'next-pim-contacts-merge' of github.com:blackberry-webworks/BB10-WebWorks-Framework into next-pim-contacts-merge
Added attribution to source
README formatting
Style fixes for block edit mode
"finished ecoli applet!!"
adicionado generator
New db settings
Adds 1st example
Renamed provider to interpreter
Merge remote-tracking branch 'origin/master'
msm7x30-common: killTARGET_QCOM_HDMI_OUT, not working with our tree yet.

Change-Id: Idacf21d495f18c6fccda0b032ebea1b7876b2977
msm7x30-common: fix a few items.

Change-Id: I85e9896c2ac56a89c3731430c31b02e0243ab81c
msm7x30: Fix location of permission xmls.

Change-Id: Id3ebce74387a97bf795d69e6d4dd62a2508a3ed6
msm7x30: Update msm_rotator.h

Change-Id: Ic0087c710890f82a8d4678e08215336433638a15
msm7x30-common: Remove BOARD_USES_QCOM_LIBRPC flag for now.

Change-Id: If42a6c03451c4b07353c9a5fabd2ccbb3e98df86
msm7x30: Enable RIL hack.

Change-Id: I4c2db60fb70f85232f60e802d297f347f69cb628
msm7x30-common: Remove unused / redundant includes.

 * We dont use a 7x30-recovery device repo... remove it.
 * Redundant and infinite inclusion of BoardConfigCommon from
   7x30-common/ device tree was causing horrendous build times
   (~2 hours). kill it.

Change-Id: I07596a4b98a74868bf0ed3de38e034c4e0104c95
msm7x30-common: update msm_mdp.h

Change-Id: Ie0807b2a806026ab6b0aa082c069291660de19b6
msm7x30-common: Update audio headers.

Change-Id: I66a6f39788106cff7cc26b0f2a65a5317d28dc63
msm7x30: Update and add media/audio configs.

Change-Id: I5acf3cf46c09e200418e78d620d058372d0f6f0d
msm7x30-common: Update usb init script syntax.

Change-Id: Id1ca6ef2449be6a3c81e67e54b324e18318ad37f
msms7x30-common: add default wallpaper overlay.

Change-Id: I345935dabc5b1c7f493a922fd3e3c9b1f5249143
msm7x30-common: Fix overlay inclusion and update wallpaper.

Change-Id: I7d69397e020e24698f317aead3bf2f28a258c277
msm7x30: Disable hw vsync and add TARGET_USES_C2D_COMPOSITION flag

Change-Id: I8b306a1de96c14e141c7a20586c4d09dab0bd496
Revert "msm7x30: Update msm_rotator.h"

This reverts commit 2f69584df3b4aa8f91c7f2d19160029d099d2c0c.
msm7x30-common: update msm_rotator.h

Change-Id: I0f495871230be61f05d19223486c7e60336a1376
Signed-off-by: Evan McClain <aeroevan@gmail.com>
msm7x30-common: update msm_vidc_dec.h

Adds vdec_aspectratioinfo struct.

Change-Id: I8813aeb060e961a60cdd6ba0ffd1a76277ae8e27
Signed-off-by: Evan McClain <aeroevan@gmail.com>
msm7x30-common: update msm_vidc_enc.h

defines VEN_IOCTL_SET_SLICE_DELIVERY_MODE

Change-Id: I7e636fd1de6e349f19cbbad5e4c2546ab7af8df8
Signed-off-by: Evan McClain <aeroevan@gmail.com>
msm7x30: Define QCOM_NO_SECURE_PLAYBACK flag

Change-Id: I60b295bfd4d13750d14c019cdcc5e602f42dda5d
msm7x30: Update msm_mdp.h

Change-Id: I75afcfcc304cd723b9715a1b346147022a7afece
BUGFIX: notification emails sent individually to each member (Issue #31)
ENHANCEMENT: added a description to the workflow action title field (Issue#48)
Merge pull request #2 from mparkhill/issue-48

Issue 48
dont reset to black background
bug fix (revert)
k3g: Pull gyro driver from I9100 sources

Small fixes needed for 2.6.35:
change usleep_range(10000,10000) to msleep(10)
change header file path

Change-Id: I38f431d8673387da87d0a597744d8f1ac6784d2e
Revert "cpufreq: Add 1 GHz step"

Causing all sorts of weird problems...

This reverts commit f4406d6905477c7eaa74fe476a8bd45bd36c81ab.
cpufreq: Fix 1.2 GHz operation

The stock frequency code set APLL to 1.0 GHz,
not 1.2 GHz.

Ooops.  That won't work well!

Change-Id: I2d9c91e6f242359c4a39c89c96de865c61f969b7
Signed-off-by: Andrew Dodd <atd7@cornell.edu>
Kernel-side lpm fixes for Infuse4g Bluetooth LPM

Based on C1att fixes for the same problem

Change-Id: I5150884fdecee7a50cf9b8074291ea5cbe107b20
activated footer links to external pages
Localisation updates from http://translatewiki.net.

Change-Id: I54f4945789bd697b5e2240a1ed586e61135d09e0
Fixing geo bug in UploadWizard

Change-Id: I30ad2825dc925d199833b3ce6af828ca3802368c
Merge "Fixing geo bug in UploadWizard"
Link 'user' namespace as well as 'main' in preferences label

This was skipped due to time constraints; now fixing up.

Change-Id: I4ef25c0aeabdcf14a078aa3360e43db223010ff7
fixed build issue (invalid scope for a logback lib)