OSDN Git Service
Lifu Tang [Sun, 8 Sep 2013 05:12:00 +0000 (05:12 +0000)]
Merge "Dim icons when recent apps category is disabled" into klp-dev
Svetoslav Ganov [Sat, 7 Sep 2013 22:05:38 +0000 (22:05 +0000)]
Merge "Print service settings polish" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 03:19:33 +0000 (20:19 -0700)]
Dim icons when recent apps category is disabled
- Fix b/
10654646
Change-Id: I7581054b0838c801cf9a6c889e8aeb9db8c7ba56
Lifu Tang [Sat, 7 Sep 2013 01:32:48 +0000 (01:32 +0000)]
Merge "Gray recent apps section when location disabled" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 01:26:21 +0000 (18:26 -0700)]
Gray recent apps section when location disabled
- Fix b/
10638903
Change-Id: I1c09661b0e5ac8d089a515b64301ddfe9bcedaa9
Lifu Tang [Sat, 7 Sep 2013 00:15:26 +0000 (00:15 +0000)]
Merge "Made "No Recent Apps" banner brighter" into klp-dev
Robert Greenwalt [Fri, 6 Sep 2013 23:35:45 +0000 (23:35 +0000)]
Merge "Use the application name instead of package." into klp-dev
Lifu Tang [Fri, 6 Sep 2013 23:05:23 +0000 (16:05 -0700)]
Made "No Recent Apps" banner brighter
- Fix b/
10638903
Change-Id: I83d3dc30315c05844ed57ee3065b099ce1ec1f96
Svetoslav Ganov [Fri, 6 Sep 2013 16:28:32 +0000 (09:28 -0700)]
Print service settings polish
1. Moved the settings and add printers to the overflow menu.
2. Collapsing the search action view to get proper behavior when selected.
3. Showing the search option only if there are printers.
4. Stop observing for printers if the service is disabled.
bug:
10652301
Change-Id: I589a3b177c5a58a8b1382d7020fd4b128afd9038
Fabrice Di Meglio [Fri, 6 Sep 2013 20:05:17 +0000 (20:05 +0000)]
Merge "Fix bug #
10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
Fabrice Di Meglio [Fri, 6 Sep 2013 00:02:28 +0000 (17:02 -0700)]
Fix bug #
10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
- well this CL is only for preventing a wrong rendering (the real CL would need to be one latter
and would need to fix the onDraw(Canvas) for LinearColorBar so that it takes care of the layout direction)
- force LTR layout direction on the LinearColorBar, hence preventing the two TextView to render their
text "in the middle".
- use BidiFormatter to wrap number strings
Change-Id: Ie164e5509c0364a81c85a3ac69f97a89f20a4130
Tom O'Neill [Fri, 6 Sep 2013 17:38:26 +0000 (10:38 -0700)]
Restrict Settings injection to system-signed apps
- Also: reload the injected settings status values on mode changes
- b/
10461474
Change-Id: I58c817ab8ab253aa19fa02c3cb511f26c807dc2a
Baligh Uddin [Fri, 6 Sep 2013 03:34:18 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Lifu Tang [Fri, 6 Sep 2013 02:01:17 +0000 (02:01 +0000)]
Merge "Don't show explicit time when no recent apps" into klp-dev
Amith Yamasani [Thu, 5 Sep 2013 22:49:20 +0000 (22:49 +0000)]
Merge "Handle renamed APIs" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 21:50:29 +0000 (14:50 -0700)]
Don't show explicit time when no recent apps
- Partial fix for b/
10638903
Change-Id: I38d681c52b3d03cdece48d3cdc027dcbe66bd0f2
Lifu Tang [Thu, 5 Sep 2013 21:47:00 +0000 (21:47 +0000)]
Merge "Fixed the NullPointerException" into klp-dev
Svetoslav Ganov [Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)]
Merge "Print settings polish" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 20:52:55 +0000 (13:52 -0700)]
Fixed the NullPointerException
- Fix b/
10633295
Change-Id: Ia429e679c53c959351316ffda7619e10ad6a626c
Baligh Uddin [Thu, 5 Sep 2013 19:46:15 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e3b8d9ebc0a38940b8864bbee841002385f5fb2
Auto-generated-cl: translation import
Amith Yamasani [Thu, 5 Sep 2013 19:40:31 +0000 (12:40 -0700)]
Handle renamed APIs
Bug:
10461761
Change-Id: If63c3801663b347a4643e44d5bd3bab4e3049578
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 12:05:04 +0000 (13:05 +0100)]
Hide "Play TTS sample" when locale is not settable as default
Due to a bug, it's possible for settings to show status telling
that locale is available, despite locale not being in list of
locales settable as TTS default locale. This change fixes it.
Bug:
10630713
Change-Id: I21f8487fc6c1ea7812aeffbc26dfa5fc0a8afa3b
Svetoslav Ganov [Thu, 5 Sep 2013 06:52:28 +0000 (23:52 -0700)]
Print settings polish
1. Added support for launching the top level print settings.
2. Updated some strings.
3. Removed the uninstall option for a print service.
4. Added search for the list of printers of a print service.
Change-Id: I9e175ba78b2d22b2bf90cf79153dc73327dfaff1
Dianne Hackborn [Thu, 5 Sep 2013 01:26:41 +0000 (01:26 +0000)]
Merge "Add details screen to proc stats." into klp-dev
Dianne Hackborn [Wed, 4 Sep 2013 22:47:59 +0000 (15:47 -0700)]
Add details screen to proc stats.
Lets you see the actual RAM use and % running time, a list of
all of the services that are associated with it (kind-of, not
working correctly for those that share processes), and most
importantly a glorious FORCE STOP button.
Change-Id: I34ac30c88f1187227a8a7809ae103118c8b9a865
Svetoslav [Thu, 5 Sep 2013 00:18:48 +0000 (00:18 +0000)]
Merge "Implementing print settings as per UX spec." into klp-dev
Chong Zhang [Wed, 4 Sep 2013 22:07:18 +0000 (22:07 +0000)]
Merge "wifi-display: add drop down list for Wps config method" into klp-dev
Svetoslav [Wed, 4 Sep 2013 04:32:40 +0000 (21:32 -0700)]
Implementing print settings as per UX spec.
Change-Id: Iafe99a1e959472f893cf168d952d9dd19ff160c0
Tom O'Neill [Wed, 4 Sep 2013 14:20:03 +0000 (14:20 +0000)]
Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:00:08 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 00:55:18 +0000 (00:55 +0000)]
Merge "Pass correct user id for the extra" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 00:44:49 +0000 (17:44 -0700)]
Pass correct user id for the extra
This was causing PrintManagerService to get a broadcast with an incorrect
userid and ended up crashing the SettingsProvider.
Bug:
10608503
Change-Id: I4693de181ddfa599d685ac9bd16ac15cea8b2e52
Geoffrey Borggaard [Wed, 4 Sep 2013 00:41:50 +0000 (00:41 +0000)]
Merge "Pin protect going into developer mode." into klp-dev
Lifu Tang [Wed, 4 Sep 2013 00:13:09 +0000 (00:13 +0000)]
Merge "Renamed "Location services" to "App settings"" into klp-dev
Vineeta Srivastava [Tue, 3 Sep 2013 23:48:34 +0000 (23:48 +0000)]
Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev
Lifu Tang [Tue, 3 Sep 2013 23:36:56 +0000 (16:36 -0700)]
Renamed "Location services" to "App settings"
- Fix b/
10610559
Change-Id: I7f7167fb45ebeb045b4c0095448de0134a551eec
Lifu Tang [Tue, 3 Sep 2013 21:26:33 +0000 (21:26 +0000)]
Merge "Fixed the crash on screen rotation" into klp-dev
Baligh Uddin [Tue, 3 Sep 2013 21:01:35 +0000 (14:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2a10a77eb978fae7a97c25de71007605a4e20248
Auto-generated-cl: translation import
Lifu Tang [Tue, 3 Sep 2013 20:47:02 +0000 (13:47 -0700)]
Fixed the crash on screen rotation
- Fix b/
10607566
Change-Id: I078e59af2a76deb272b870d7708ee4148c68590e
Russell Brenner [Tue, 3 Sep 2013 20:26:42 +0000 (20:26 +0000)]
Merge changes Ie232b2d4,I81b6bf3f into klp-dev
* changes:
Add resources for light theme
Support Holo Light theme for wifi during setup
Tom O'Neill [Tue, 3 Sep 2013 20:26:09 +0000 (20:26 +0000)]
Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev
Vineeta Srivastava [Thu, 29 Aug 2013 00:17:57 +0000 (17:17 -0700)]
Show regulatory info based on hardware sku in Settings app.
Use ro.boot.hardware.sku to read hardware sku property. When this property is
set use regulatory_info_<sku>.img. By default use regulatory_info.png
Updated layout to set ImageView.
Bug:
9378140
Change-Id: I8e3622a89742333818297759585227c6290ccf31
Lifu Tang [Tue, 3 Sep 2013 17:55:48 +0000 (17:55 +0000)]
Merge "Ignores AppOps entries belonging to other users" into klp-dev
Martijn Coenen [Tue, 3 Sep 2013 17:25:15 +0000 (17:25 +0000)]
Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
Lifu Tang [Fri, 30 Aug 2013 23:02:16 +0000 (16:02 -0700)]
Ignores AppOps entries belonging to other users
- Fix b/
10567352
Change-Id: I6aac030a426e5a881578b518a9cf6bad8679d087
Lifu Tang [Tue, 3 Sep 2013 17:01:56 +0000 (17:01 +0000)]
Merge "Creates Sipper even the consumption is very little" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 17:01:33 +0000 (17:01 +0000)]
Merge "Shows correct state when location sharing disabled" into klp-dev
Amith Yamasani [Tue, 3 Sep 2013 15:57:24 +0000 (15:57 +0000)]
Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
Lifu Tang [Sat, 31 Aug 2013 01:03:43 +0000 (18:03 -0700)]
Creates Sipper even the consumption is very little
Change-Id: I9682f262a481f3586760b8464b96eeb22814a840
Tom O'Neill [Tue, 3 Sep 2013 14:56:53 +0000 (07:56 -0700)]
Switch to receiving LocationManager.MODE_CHANGED_ACTION
- From LocationManager.PROVIDERS_CHANGED
- Part of fix for b/
10409275
Change-Id: I4030c8df4db942777d6035266a8ed7f18e458fb5
Wink Saville [Sat, 31 Aug 2013 00:26:19 +0000 (17:26 -0700)]
am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
d5c71fc4e613d80d1ff8c128f29d9c201bcb3f90':
Use correct action string for provisioning.
Lifu Tang [Fri, 30 Aug 2013 01:06:30 +0000 (18:06 -0700)]
Shows correct state when location sharing disabled
- Fix b/
10553306
Change-Id: I01f69aaeb79e18ddf29da5aef7ea00938e674429
Amith Yamasani [Fri, 30 Aug 2013 22:43:44 +0000 (15:43 -0700)]
Add a missing fragment to list of valid ones for top-level settings
Bug:
10552817
Change-Id: I1ea80de565d1ec58da834cdd67dab0cb71e635b7
Alan Viverette [Fri, 30 Aug 2013 21:35:04 +0000 (21:35 +0000)]
Merge "Update captioning settings to match revised API" into klp-dev
Geoffrey Borggaard [Fri, 30 Aug 2013 20:07:20 +0000 (16:07 -0400)]
Pin protect going into developer mode.
Developer mode turns on ADB which we definately don't want students to do.
Bug:
10549646
Change-Id: Ibba6231d36427985da6c258002e319e33a15b9b8
Martijn Coenen [Fri, 30 Aug 2013 19:57:42 +0000 (12:57 -0700)]
NFC Tap&Pay: deal with changes from API review.
Also, removed "Ask every time" mode.
Bug:
10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
Tom O'Neill [Fri, 30 Aug 2013 17:52:55 +0000 (10:52 -0700)]
Adapt to renaming of SettingInjectorService API constants
- Log how long it took to read the status of each setting.
- Fix some variable names.
- Affects b/
10461474
Change-Id: Ic0a575f090bf7192b20e07c231bf9d7238571808
Russell Brenner [Wed, 28 Aug 2013 16:44:30 +0000 (09:44 -0700)]
Add resources for light theme
Bug:
10407819
Change-Id: Ie232b2d48a8d67355d7c31a878ebaa79aae7c44d
Maggie Benthall [Fri, 30 Aug 2013 13:54:28 +0000 (13:54 +0000)]
Merge "Fixes for pin-restricted settings." into klp-dev
Wink Saville [Fri, 30 Aug 2013 03:42:59 +0000 (20:42 -0700)]
am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
e38165caf08a164999b9518dd1f16c9f94d581e9':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 03:41:04 +0000 (20:41 -0700)]
am
7bee4c29: Use correct action string for provisioning.
* commit '
7bee4c294204be49edf58e9251726425ffcc5748':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 02:58:09 +0000 (19:58 -0700)]
Use correct action string for provisioning.
Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK
Bug:
10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098
Chong Zhang [Thu, 29 Aug 2013 22:33:12 +0000 (15:33 -0700)]
wifi-display: add drop down list for Wps config method
Bug:
9371882
Change-Id: I8c8c645bbb3db9f9d038f015f6aa6078ce3e56c3
Lifu Tang [Thu, 29 Aug 2013 23:43:59 +0000 (23:43 +0000)]
Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
Wink Saville [Thu, 29 Aug 2013 22:15:53 +0000 (15:15 -0700)]
am
1bc2db22: am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
1bc2db2221f6cdb92cce5d40f9eb940fe0ed4914':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:11:11 +0000 (22:11 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
Maggie Benthall [Thu, 29 Aug 2013 14:49:13 +0000 (10:49 -0400)]
Fixes for pin-restricted settings.
- Reprompt for pin after screen has been locked and unlocked.
- For protected preferences, store the Preference and continue if pin entry is successful.
- Protect whole UserSettings and DevelopmentSettings pages.
Bug:
10543207
Change-Id: If1d4b31ca94a8cfc103625b74385bcd0bdd3d88b
Lifu Tang [Thu, 29 Aug 2013 21:42:12 +0000 (14:42 -0700)]
Replaced ContentQueryMap with CursorLoader
- Piggyback a trivial typo fix from previous change
- Fix b/
10228666
Change-Id: I96c4f5c434b67caf10b3406eec4f3f7c5cf846e9
Tom O'Neill [Thu, 29 Aug 2013 21:22:54 +0000 (21:22 +0000)]
Merge "Make sure we've finished loading settings before processing any reloads" into klp-dev
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Martijn Coenen [Thu, 29 Aug 2013 21:01:16 +0000 (21:01 +0000)]
Merge "Update NFC payments to match new framework APIs." into klp-dev
Wink Saville [Thu, 29 Aug 2013 18:57:48 +0000 (11:57 -0700)]
am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
0e042a44a8ee0e26d92be8d73d7ed297b4beab37':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Lifu Tang [Thu, 29 Aug 2013 18:31:27 +0000 (18:31 +0000)]
Merge "Fixed the widget location toggle button" into klp-dev
Tom O'Neill [Thu, 29 Aug 2013 17:48:13 +0000 (10:48 -0700)]
Make sure we've finished loading settings before processing any reloads
- Effectively throttles case where many reloads are sent in rapid
succession.
- Simplify Handler state machine by making the state explicit instead
of implicit in the sequence of messages.
- To guard against cascading timeouts due to RAM pressure or other
systemic issues, only start additional services if there is at most one
timed out setting at a time.
- Add some log messages
- Fix b/
10487253
Change-Id: Ibe21533f7b644bbadf5b56b61ca0e28b49192470
Wink Saville [Thu, 29 Aug 2013 17:23:04 +0000 (10:23 -0700)]
am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
289c2f0d3013f423849a9485b3044f0a1fc8dd92':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 17:20:24 +0000 (17:20 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
Baligh Uddin [Thu, 29 Aug 2013 14:59:30 +0000 (07:59 -0700)]
am
f7b5ad80: (-s ours) am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
f7b5ad80a8e31d717ffed1a0b7a1403c3bf75cd1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:57:04 +0000 (07:57 -0700)]
am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
da7395d6c5a92738c2e7130590f30a536ec94b54':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:56:04 +0000 (07:56 -0700)]
am
439b1543: (-s ours) am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
439b1543119fd97d134c602d92fc6ce9a517be20':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:56 +0000 (07:53 -0700)]
am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
c79028454106f4e73702c4bd4dde36a37beca90c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:47 +0000 (07:53 -0700)]
am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:50:25 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 06:36:55 +0000 (23:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:33:19 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:32:03 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
Martijn Coenen [Thu, 29 Aug 2013 02:28:17 +0000 (19:28 -0700)]
Update NFC payments to match new framework APIs.
Bug:
10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
Amith Yamasani [Thu, 29 Aug 2013 01:04:10 +0000 (01:04 +0000)]
Merge "Fix RTL layout of text in Battery history screen" into klp-dev
Lifu Tang [Wed, 28 Aug 2013 22:55:49 +0000 (15:55 -0700)]
Fixed the widget location toggle button
- Fix b/
10531669
Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69
Lifu Tang [Wed, 28 Aug 2013 22:29:54 +0000 (22:29 +0000)]
Merge "Disallows setting when user restriction applies" into klp-dev
Amith Yamasani [Wed, 28 Aug 2013 21:15:52 +0000 (14:15 -0700)]
Fix RTL layout of text in Battery history screen
Change the anchor position and alignment direction for text.
Bug:
10447666
Change-Id: Ida4161c738cf9a32cc8ff98037f3755046e64e33
Amith Yamasani [Wed, 28 Aug 2013 21:52:59 +0000 (21:52 +0000)]
Merge "Add more fragments to valid list for Wifi activity" into klp-dev
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Lifu Tang [Wed, 28 Aug 2013 00:09:55 +0000 (17:09 -0700)]
Disallows setting when user restriction applies
- Fix b/
10116533
Change-Id: Ib171f9545c1651fb36c408decefa47b3d82ba3ab
Amith Yamasani [Wed, 28 Aug 2013 19:38:46 +0000 (12:38 -0700)]
Add more fragments to valid list for Wifi activity
Bug:
10508371
Change-Id: Ic2d2128433ae26ea6750281b978781cb56b97036
Russell Brenner [Thu, 22 Aug 2013 18:22:35 +0000 (11:22 -0700)]
Support Holo Light theme for wifi during setup
Adds programmatic support for holo light theme, activated by setting
EXTRA_THEME to "holo_light". Light-themed graphics are still pending.
Bug:
10407819
Change-Id: I81b6bf3fdf7ca3ee72b0f921b8adf6d858415887
Baligh Uddin [Wed, 28 Aug 2013 02:42:22 +0000 (19:42 -0700)]
am
d866be38: (-s ours) am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
d866be382b330ae6c96dfe0de66f2426945b7730':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:40:21 +0000 (19:40 -0700)]
am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:39:03 +0000 (19:39 -0700)]
am
56fc8b77: (-s ours) am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
56fc8b77643411ca8c43b0f3d178c3804de7093b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:37:03 +0000 (19:37 -0700)]
am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:36:48 +0000 (19:36 -0700)]
am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
d8c9c146e79636f44808e2514e666f0966cc5596':
Import translations. DO NOT MERGE