summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Unbreak manual brightness setting."Michael Wright2014-02-211-1/+1
|\
| * Unbreak manual brightness setting.Michael Wright2014-02-201-1/+1
| | | | | | | | Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
* | Merge "resolved conflicts for merge of baaa080b to master"Jeff Brown2014-02-2132-277/+1376
|\ \
| * \ resolved conflicts for merge of baaa080b to masterJeff Brown2014-02-2032-277/+1376
| |\ \ | | | | | | | | | | | | Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
| | * \ am 90506a41: am 07e6d1b9: Merge "Add a new "doze mode" based on Dream ↵Jeff Brown2014-02-2031-287/+1377
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | components." into klp-modular-dev * commit '90506a41c6b85cf7e65b663480e4fe003a99c8c2': Add a new "doze mode" based on Dream components.
| | | * \ am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into ↵Jeff Brown2014-02-2031-287/+1377
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '07e6d1b9a5f81ff5a5bf91f2b260ee487d5f2b65': Add a new "doze mode" based on Dream components.
| | | | * \ Merge "Add a new "doze mode" based on Dream components." into klp-modular-devJeff Brown2014-02-2031-287/+1377
| | | | |\ \
| | | | | * | Add a new "doze mode" based on Dream components.Jeff Brown2014-02-2031-287/+1377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a doze component has been specified in a config.xml resource overlay, the power manager will try to start a preconfigured dream whenever it would have otherwise gone to sleep and turned the screen off. The dream should render whatever it intends to show then call startDozing() to tell the power manager to put the display into a low power "doze" state and allow the application processor to be suspended. The dream may wake up periodically using the alarm manager or other features to update the contents of the display. Added several new config.xml resources related to dreams and dozing. In particular for dozing there are two new resources that pertain to decoupling auto-suspend mode and interactive mode from the display state. This is a requirement to enable the application processor and other components to be suspended while dozing. Most devices do not support these features today. Consolidated the power manager's NAPPING and DREAMING states into one to simplify the logic. The NAPPING state was mostly superfluous and simply indicated that the power manager should attempt to start a new dream. This state is now tracked in the mSandmanSummoned field. Added a new DOZING state which is analoguous to DREAMING. The normal state transition is now: AWAKE -> DREAMING -> DOZING -> ASLEEP. The PowerManager.goToSleep() method now enters the DOZING state instead of immediately going to sleep. While in the doze state, the screen remains on. However, we actually tell the rest of the system that the screen is off. This is somewhat unfortunate but much of the system makes inappropriate assumptions about what it means for the screen to be on or off. In particular, screen on is usually taken to indicate an interactive state where the user is present but that's not at all true for dozing (and is only sometimes true while dreaming). We will probably need to add some more precise externally visible states at some point. The DozeHardware interface encapsulates a generic microcontroller interface to allow a doze dream for off-loading rendering or other functions while dozing. If the device possesses an MCU HAL for dozing then it is exposed to the DreamService here. Removed a number of catch blocks in DreamService that caught Throwable and attempted to cause the dream to finish itself. We actually just want to let the process crash. Cleanup will happen automatically if needed. Catching these exceptions results in mysterious undefined behavior and broken dreams. Bug: 12494706 Change-Id: Ie78336b37dde7250d1ce65b3d367879e3bfb2b8b
* | | | | | | Merge "Add ability to match intents based on the package name of the intent ↵Ben Gruver2014-02-212-0/+74
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sender"
| * | | | | | | Add ability to match intents based on the package name of the intent senderBen Gruver2014-02-122-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf9feececcff9188b1b02751aff6c3ab541dc73d
* | | | | | | | Merge "Add more MediaStore constants for playback intents"Matt Casey2014-02-213-0/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add more MediaStore constants for playback intentsMatt Casey2014-02-203-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constants are derived from this doc: https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv That doc contains the full explanation of these changes. I'm making this change on behalf of {elmas,pengr} who don't have android source access but designed this in collaboration with rharagutchi on the play music team. I'll probably have to route any significant questions through them. Bug: 12874557 Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
* | | | | | | | Merge "Abort removing account if prohibited by policy"Amith Yamasani2014-02-211-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Abort removing account if prohibited by policyAmith Yamasani2014-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13077993 If an EDU device was marked as prohibited from adding/removing accounts, it was throwing an error but still continuing to remove the account. This fixes the problem by aborting the removeAccount steps. Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
* | | | | | | | | am 17b7705a: (-s ours) am fbb100c4: (-s ours) am ea17c636: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '17b7705afb3e36a6239fdcc3fadfa6601f32fe98': Import translations. DO NOT MERGE
| * | | | | | | | am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'fbb100c437d52db818e6e57c18ffe1e969ba46b0': Import translations. DO NOT MERGE
| | * | | | | | | am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ea17c6365fd70b057a4c696d9eec2b5f70b6e476': Import translations. DO NOT MERGE
| | | * | | | | | am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge ↵Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit '4292ce5d0023551a6fa7a02b284bf9b02823b06b': Import translations. DO NOT MERGE
| | | | * \ \ \ \ \ am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '810267c309f018c5b58b0a2e787b8a6434faa0e0': Import translations. DO NOT MERGE
| | | | | * \ \ \ \ \ am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28009e8102aa91294362cc2d7770cab73d02e640': Import translations. DO NOT MERGE
| | | | | | * \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-208-15/+15
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-198-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0 Auto-generated-cl: translation import
* | | | | | | | | | | | | am c87c6a2a: (-s ours) am a69996e4: (-s ours) am 701449e8: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c87c6a2a4630e53d8dc07eb53095776fa31c463f': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a69996e45c7c40d971b05a56866b7ac5c7f617de': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '701449e85395d7a81d244d4b115b9ef4ae2f06d9': Import translations. DO NOT MERGE
| | | * | | | | | | | | | am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge ↵Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit 'c9443fc54caa789c4e3c64e7d9feaee8ac00506f': Import translations. DO NOT MERGE
| | | | * | | | | | | | | am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '8ca432c7828d5d3d00c721b195a4ecb59564bbb7': Import translations. DO NOT MERGE
| | | | | * | | | | | | | am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2803d473ad180fa70e5000f0607795c92c4035d': Import translations. DO NOT MERGE
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-4/+4
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-4/+4
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132 Auto-generated-cl: translation import
* | | | | | | | | | | | | am 46f1744a: (-s ours) am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '46f1744acf7bd795ac80ed10a5b6bd3f03682b46': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2f07a7059f4471963c114b0ab944249e8746cbf9': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '50d0afa43af2b215ddddbc7a3adfb8b5d85cb549': Import translations. DO NOT MERGE
| | | * | | | | | | | | | am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge ↵Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit '2f5347ee46766134848586d67d2dd86bdc9d1952': Import translations. DO NOT MERGE
| | | | * | | | | | | | | am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '1af20cc5764a38d0713a292fd63bf6a628f2f5eb': Import translations. DO NOT MERGE
| | | | | * | | | | | | | am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '554b43a066b6a084dbb9b7dba014de4b12ba1175': Import translations. DO NOT MERGE
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-2013-47/+47
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-1913-47/+47
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9205c555286daf7dea68702d2da39752b59def4 Auto-generated-cl: translation import
* | | | | | | | | | | | | am e16fe1aa: (-s ours) am 13e85016: (-s ours) am 749e6b9c: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '13e850160d21008597239dc974c805df057d4e1b': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '749e6b9cf21799aefe9accc50c60f6bfddf1545a': Import translations. DO NOT MERGE
| | | * | | | | | | | | | am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge ↵Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit '5da96060e61c3076d0a5cbd87a3f17254414afeb': Import translations. DO NOT MERGE
| | | | * | | | | | | | | am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef': Import translations. DO NOT MERGE
| | | | | * | | | | | | | am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa20b27472552ebc812dfbb3cbe260115ee43db1': Import translations. DO NOT MERGE
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-2/+2
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-2/+2
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37 Auto-generated-cl: translation import
* | | | | | | | | | | | | am e9a5424c: (-s ours) am a935d31c: (-s ours) am bf2226ec: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e9a5424cc64e44812383ab9e417f18b8a1f647d1': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a935d31ca87146990010121b576506faef803404': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'bf2226ec7f9fcb0a2fc169df170c770363d9a3f5': Import translations. DO NOT MERGE
| | | * | | | | | | | | | am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge ↵Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit '8b297fb6ef42650a1126287aa0b610aa9a503167': Import translations. DO NOT MERGE
generated by cgit v1.1 at 2024-09-10 21:54:22 +0000