Carsten "Tomcat" Book
5c21e2135f
Merge m-c to b2g-inbound
2014-09-05 12:20:46 +02:00
Carsten "Tomcat" Book
263bff5d15
Backed out changeset e6f223a82d91 (bug 937485) for causing b2g device regressions
2014-09-05 12:12:10 +02:00
Hsin-Yi Tsai
53dfd5bdd6
Bug 1061535 - [B2G][RIL] relax restrictions on EF_IMG error handling - part 2 - test. r=edgar
2014-09-04 12:13:20 +08:00
Hsin-Yi Tsai
eba9419907
Bug 1061535 - [B2G][RIL] relax restrictions on EF_IMG error handling - part 1 - fix. r=edgar
2014-09-03 15:53:09 +08:00
Vicamo Yang
00d165c73f
Bug 937485: [WebIcc] use Webidl enum for cardState. r=echen, r=smaug
2014-09-04 10:31:41 +08:00
Garvan Keeley
a3460d681c
Bug 1056857 - Code cleanup related to debugging flags. r=kanru
...
- change #define to const char* for consistency
- change int to bool for bool flags
- make debug log messages more concise, multi-line messages (that could be one-line) make watching the debug log difficult
2014-09-02 21:09:00 -04:00
Garvan Keeley
6ff59e6426
Bug 1056857 - Add debug flag for ignoring GPS locations. r=kanru
...
Also added observer of Gaia settings changes, so the debug settings
can be toggled on the fly.
2014-09-03 06:58:00 -04:00
Alexandre Lissy
df74b6bf5c
Bug 955946 - Distinguish SIM/USIM getResponse p1/p2/p3 parameters. r=echen
...
Performing proper ICC_IO operations depends on the type of the SIM card.
For example, the Desire Z will work with FCP Template, so we need to
follow TS 102.221 table 11.2 to perform the proper request and get a FCP
Template. This is done when we write the ICC_IO command: we need to set
the p2/p3 fields depending on the SIM card type (SIM or USIM) so that
the proper behavior is triggered.
2014-09-03 02:31:00 -04:00
Ryan VanderMeulen
a89c42d78e
Backed out changeset 59611423c368 (bug 1038531) for marionette-webapi failures.
2014-09-03 11:30:32 -04:00
Henry Chang
4dbc8e4fd0
Bug 1038531 - Unify NetworkWorker. r=mrbkap r=fabrice
2014-08-18 11:02:56 +08:00
Edgar Chen
4e1afb3542
Bug 843452 - Part 5: Changes for xpcshell test. r=hsinyi
2014-06-04 19:28:03 +08:00
Edgar Chen
f8291ab3db
Bug 843452 - Part 4-7: [NetworkGeolocationProvider] Get dataInfo via MobileConnectionService. r=kchen
2014-08-11 16:15:59 +08:00
Edgar Chen
61fb744319
Bug 843452 - Part 4-6: [NetworkManager] Get dataInfo via MobileConnectionService. r=vicamo
2014-08-11 16:05:43 +08:00
Edgar Chen
d8bfd6768c
Bug 843452 - Part 4-5: MobileConnectionGonkService for gonk backend. r=hsinyi,khuey
2014-02-10 19:55:22 +08:00
Edgar Chen
5d00c2cee6
Bug 843452 - Part 4-2: [GPS] Get voiceInfo via MobileConnectionService. r=kchen
2014-07-01 18:46:05 +08:00
Edgar Chen
b64b8b68e3
Bug 843452 - Part 4-1: Interface changes for gonk backend. r=hsinyi
2014-07-02 18:08:59 +08:00
Phil Ringnalda
9def110412
Merge m-c to b-i
2014-08-31 18:44:20 -07:00
Birunthan Mohanathas
c5d2ecf8af
Bug 1058101 - Move dom/src/geolocation/ into dom/. r=mccr8
...
--HG--
rename : dom/src/geolocation/moz.build => dom/geolocation/moz.build
rename : dom/src/geolocation/nsGeoPosition.cpp => dom/geolocation/nsGeoPosition.cpp
rename : dom/src/geolocation/nsGeoPosition.h => dom/geolocation/nsGeoPosition.h
rename : dom/src/geolocation/nsGeoPositionIPCSerialiser.h => dom/geolocation/nsGeoPositionIPCSerialiser.h
rename : dom/src/geolocation/nsGeolocation.cpp => dom/geolocation/nsGeolocation.cpp
rename : dom/src/geolocation/nsGeolocation.h => dom/geolocation/nsGeolocation.h
2014-08-30 21:43:45 -07:00
Kyle Machulis
91ef20c261
Bug 1015518 - Update users of settings observer 'message' field to use boolean; r=gene a=2.1
2014-08-27 21:01:31 -07:00
Kyle Machulis
41a4e59da7
Bug 900551 - Make marionette webapi tests use transaction events for settings; r=edgar r=hchang r=dlee
2014-08-27 21:01:30 -07:00
Ryan VanderMeulen
a3c8179253
Merge b2g-inbound to m-c. a=merge
2014-08-29 15:26:40 -04:00
Ryan VanderMeulen
b6151e4634
Merge fx-team to m-c. a=merge
2014-08-29 15:10:18 -04:00
Szu-Yu Chen [:aknow]
4ca17745e5
Bug 1060222 - Fix an error in ril_worker.js. r=htsai
2014-08-28 23:10:00 -04:00
Randy Lin
a0097ef383
Bug 1055920 - [B2G][AudioChannel] Avoid to create unnecessary AudioChannel instance on child process. r=baku
2014-08-29 14:10:16 +08:00
Bevis Tseng
990009c3f3
Bug 1057973 - Part 2: QueryInterface(Ci.nsIRilNetworkInterface) before accessing serviceId property. r=vyang
2014-08-28 10:54:39 +08:00
Lynn Tran
88d9d61cd5
Bug 999748 - Add the user trash directory to OS.Constants.Path. r=yoric
2014-08-26 08:51:24 -04:00
Ryan VanderMeulen
b392753c94
Backed out 11 changesets (bug 1059079, bug 1015518, bug 900551, bug 846200) for Gaia UI test failures on a CLOSED TREE.
...
Backed out changeset d85b4e48b3b4 (bug 1015518)
Backed out changeset 663b73ba69ec (bug 1015518)
Backed out changeset 5cf1cb5fa022 (bug 900551)
Backed out changeset b953dd5bfdaa (bug 900551)
Backed out changeset a2b6d7c84100 (bug 900551)
Backed out changeset ceb79fe83d15 (bug 900551)
Backed out changeset f6acf344fbf0 (bug 900551)
Backed out changeset fa269ea53937 (bug 846200)
Backed out changeset b89c84a850f9 (bug 846200)
Backed out changeset b7a7dfbe4e3f (bug 846200)
Backed out changeset c6f54d821c11 (bug 1059079)
2014-08-28 12:49:49 -04:00
Ryan VanderMeulen
0e22acf2f0
Backed out changeset 52b00288469c (bug 1015518) for Gaia UI test perma-fails.
...
CLOSED TREE
--HG--
extra : amend_source : f14efe30e300b626cffa22066c28a0fbda42a80b
2014-08-28 12:44:39 -04:00
Carsten "Tomcat" Book
5cf14f5102
Merge mozilla-central to b2g-inbound
2014-08-28 16:15:55 +02:00
Kyle Machulis
cf0f5d6d8d
Bug 1015518 - Update users of settings observer 'message' field to use boolean; r=gene
2014-08-27 21:01:31 -07:00
Kyle Machulis
90a78b5c88
Bug 900551 - Make marionette webapi tests use transaction events for settings; r=edgar r=hchang r=dlee
2014-08-27 21:01:30 -07:00
Edgar Chen
69189c76e0
Bug 1058585 - setDataRegistration instantly replies success if it doesn't need to send a request to rild. r=hsinyi
2014-08-26 17:56:27 +08:00
Edgar Chen
d5df331259
Bug 1052865 - Mapping the request to different ID based on RIL version. r=hsinyi
2014-08-24 23:52:00 +08:00
Jim Chen
67cb28f899
Bug 1056941 - Fix dangerous destructors in Fennec code; r=blassey
2014-08-26 15:07:59 -04:00
Edgar Chen
c36acbc622
Bug 1013847 - Part 2-2: Add xpcshell test for icc with app index is -1. r=hsinyi
2014-08-20 14:47:04 +08:00
Edgar Chen
a493d32f63
Bug 1013847 - Part 2-1: Put cardState related tests into a separated test file. r=hsinyi
2014-08-20 14:46:44 +08:00
Edgar Chen
a467c2d24f
Bug 1013847 - Part 1-4: Create IccInfo object even if appType is unknown. r=hsinyi
2014-08-18 15:15:16 +08:00
Edgar Chen
b7a1da6b32
Bug 1013847 - Part 1-3: Read ICCID and set cardState to unknown if appIndex is -1. r=hsinyi
2014-08-20 16:10:07 +08:00
Edgar Chen
1cdc5ada1e
Bug 1013847 - Part 1-2: Don't need to cache iccStatus in RilObject. r=hsinyi
2014-08-20 16:10:38 +08:00
Edgar Chen
c4a10c3c96
Bug 1013847 - Part 1-1: getEFPath() don't need to check appType for common files. r=hsinyi
2014-08-20 15:56:50 +08:00
Wes Kocher
2c9ce1520b
Backed out 17 changesets (bug 843452)
...
Backed out changeset e72a0297d488 (bug 843452)
Backed out changeset 73f62ce4190f (bug 843452)
Backed out changeset 6d4a49ebd9fc (bug 843452)
Backed out changeset ac93e396669f (bug 843452)
Backed out changeset cf4fc721821e (bug 843452)
Backed out changeset 9a94ea71d232 (bug 843452)
Backed out changeset b95ff097374d (bug 843452)
Backed out changeset 8d6428a93500 (bug 843452)
Backed out changeset e31b86ef0e80 (bug 843452)
Backed out changeset bd4efde535cd (bug 843452)
Backed out changeset 02bbcd8ac571 (bug 843452)
Backed out changeset f7f41bf82b22 (bug 843452)
Backed out changeset 20f42764cd38 (bug 843452)
Backed out changeset 82f8670f5c17 (bug 843452)
Backed out changeset 52f25f1278e3 (bug 843452)
Backed out changeset 181337820a7c (bug 843452)
Backed out changeset 9bd12641af03 (bug 843452)
--HG--
rename : dom/mobileconnection/interfaces/nsIMobileConnectionService.idl => dom/mobileconnection/interfaces/nsIMobileConnectionProvider.idl
2014-08-28 16:51:41 -07:00
Wes Kocher
d675b10b9f
Merge m-c to inbound a=merge
2014-08-27 16:59:25 -07:00
Garvan Keeley
3e8f5ba116
Bug 1033274 - Added logic when MLS responds to GPS provider. r=kanru
...
NetworkGeolocationProvider is listened to by the Gonk GPS provider, and
these updates are to be used in certain cases (such as the GPS is
inactive) or ignored in other cases so as not overwrite an accuracte GPS
location with and inaccurate MLS location.
Fixed the GPS position's timestamp; the code was using the satellite provided
timestamp. This timestamp bubbles up to the DOM eventually, which has no
knowledge of GPS timestamp delays, thus it needs the current system time.
2014-08-22 07:37:00 -04:00
Edgar Chen
bd4a58e529
Bug 843452 - Part 5: Changes for xpcshell test. r=hsinyi
2014-06-04 19:28:03 +08:00
Edgar Chen
59ec94a64f
Bug 843452 - Part 4-6: [NetworkManager] Get dataInfo via MobileConnectionService. r=vicamo
2014-08-11 16:05:43 +08:00
Bevis Tseng
02650fce38
Bug 1056625 - Reply nsIMobileMessageCallback.NOT_FOUND_ERROR instead of response.errorMsg from ril_worker when failed to getSmscAddress(). r=vyang
2014-08-22 15:28:02 +08:00
Hsin-Yi Tsai
d2cf9f5a1f
Bug 824145 - Part 4: Support for STK icon display (xpcshell). r=edgar
2014-08-20 16:52:42 +08:00
Jessica Jong
9bd79f5888
Bug 824145 - Part 2: Support for STK icon display (impl). r=edgar
2014-08-25 10:32:35 +08:00
Szu-Yu Chen [:aknow]
1e24f537b8
Bug 1056522 - Set mmiServiceCode in one place. r=hsinyi
...
--HG--
extra : rebase_source : cbe87a46277e1f2f25ab72ff0f5ce4f6bbc0c527
2014-08-22 03:25:00 -04:00
Bevis Tseng
10845b71c0
Bug 1055994 - Broadcast System Message When Receiving Cell Broadcast Message. r=vyang
...
--HG--
extra : rebase_source : 9b69b4e23240e791d40a32e9211a93d7c5a0d7c7
2014-08-20 19:17:34 +08:00
Shawn Ku
2ab17146f4
Bug 1056449 - B2G RIL: Correct trigger point for overrideICCNetworkName for OPL/PNN reading. r=Edgar
...
--HG--
extra : rebase_source : dbdd66984af06744b68f75ce0d27891e7ef11c5d
2014-08-22 10:05:34 +08:00
Bevis Tseng
9b9dc5a1fb
Bug 1032097 - Part 5: Remove MOZ_B2G_RIL closure for selectGateway()/resolveHostname(). r=echen
...
--HG--
extra : rebase_source : 9af50b9c38ef76e66a197e26e832094091d8dead
2014-08-15 16:27:12 +08:00
Bevis Tseng
5f0c3bc4b9
Bug 1032097 - Part 4: Expose new APIs addHostRoute/removeHostRoute from NetworkManager. r=echen
...
--HG--
extra : rebase_source : 68a7c9b8086d64e053750f7d48a23d2a0aa53377
2014-08-15 16:23:44 +08:00
Bevis Tseng
1af8799014
Bug 1032097 - Part 3: Refactor setHostRoutes()/removeHostRoutes(). r=echen
...
--HG--
extra : rebase_source : 99f0e0d45158828e0783f83fde6ae1cd45aed6a9
2014-08-15 16:17:20 +08:00
Bevis Tseng
154da13004
Bug 1032097 - Part 2: Rewrite resolveHostname() with Promise and one host to be resolved instead of a list of hosts. r=echen
...
--HG--
extra : rebase_source : 3db4d54cc8af0e81b3dc6c52f5707628202926d4
2014-08-15 15:55:54 +08:00
Bevis Tseng
7d71789ea9
Bug 1032097 - Part 1: Deprecate setExtraHostRoute/removeExtraHostRoute. r=echen
...
--HG--
extra : rebase_source : 5270413a18e4bd97d77464e36bcc28fd924d3f93
2014-08-15 15:53:07 +08:00
Dave Hylands
4c3f030ade
Bug 1049240 - Integrate MTP with the AutoMounter. r=echou
2014-08-19 13:41:35 -07:00
Nigel Babu
d074be59bd
Backed out changeset 19e59c14b0aa (bug 1049240) for xpshell bustage
2014-08-20 12:19:36 +05:30
Kyle Machulis
324ae33c35
Backed out 82bed38ff50a (bug 900551, bug 1015518, bug 846200) due to marionette webapi test bustage on ICS Emulator
2014-08-19 22:33:36 -07:00
Kyle Machulis
3405fcc619
Backed out c4c490f3b301, previous backout of bug 900551, bug 1011518, bug 846200, now fixed by bug 1055898 (51afb4de4a25)
2014-08-19 21:05:50 -07:00
Hsin-Yi Tsai
f468e71fa1
Bug 935843 - B2G RIL: Parse EF_IMG from SIM - part 4 - xpcshell stk. r=edgar
2014-08-12 18:05:38 +08:00
Hsin-Yi Tsai
c8ad12afb7
Bug 935843 - B2G RIL: Parse EF_IMG from SIM - part 3 - xpcshell IconLoader. r=edgar
2014-08-15 17:11:47 +08:00
Hsin-Yi Tsai
213c96ef14
Bug 935843 - B2G RIL: Parse EF_IMG from SIM - part 2 - xpcshell SimRecordHelper. r=edgar
2014-08-13 19:09:21 +08:00
Hsin-Yi Tsai
b2844e4fb7
Bug 935843 - B2G RIL: Parse EF_IMG from SIM - part 1 - impl. r=edgar, r=vicamo
2014-08-13 19:06:32 +08:00
Wes Kocher
b44b024b88
Backed out 8 changesets (bug 1015518, bug 900551, bug 1011518, bug 846200) for build bustage
...
Backed out changeset 59eb7edaa6ed (bug 1015518)
Backed out changeset 04a531d5647e (bug 1011518)
Backed out changeset 9ac939654549 (bug 1011518)
Backed out changeset 2f707489d892 (bug 900551)
Backed out changeset f2a0a448e563 (bug 900551)
Backed out changeset f130f54ea09a (bug 900551)
Backed out changeset 9d38e8901847 (bug 846200)
Backed out changeset 744da032a2de (bug 846200)
2014-08-19 14:49:02 -07:00
Kyle Machulis
fe7068249e
Bug 1015518 - Update users of settings observer message field to use boolean; r=gene
2014-08-19 13:43:58 -07:00
Dave Hylands
05fb00374e
Bug 1049240 - Integrate MTP with the AutoMounter. r=echou
...
--HG--
extra : rebase_source : a4d8cd8413ef1ea7dddb57fed87c723a923ea0bf
2014-08-19 13:41:35 -07:00
Szu-Yu Chen [:aknow]
c09163d500
Bug 1053110 - Part 4: Move clir logic to TelephonyService. r=hsinyi
2014-08-19 00:24:00 -04:00
Szu-Yu Chen [:aknow]
e14884ba69
Bug 1053110 - Part 2: Refactor MMI regex. r=hsinyi
2014-08-19 00:23:00 -04:00
Kan-Ru Chen (陳侃如)
36b5f683ed
Bug 1050899 - Check mAGpsRilInterface before use. r=dougt
2014-08-15 04:24:00 -04:00
Edgar Chen
f6ab184f0b
Bug 843452 - Part 4-5: MobileConnectionGonkService for gonk backend. r=hsinyi,khuey
2014-02-10 19:55:22 +08:00
Edgar Chen
55b22fca73
Bug 843452 - Part 4-2: [GPS] Get voiceInfo via MobileConnectionService. r=kchen
2014-07-01 18:46:05 +08:00
Edgar Chen
abb03be058
Bug 843452 - Part 4-1: Interface changes for gonk backend. r=hsinyi
2014-07-02 18:08:59 +08:00
Dave Hylands
fd32b3e231
Bug 1059086 - Stop and start MTP server properly when USB cable is unplugged and replugged. r=Alphan
2014-08-28 13:13:10 -07:00
Dave Hylands
542fef64a3
Bug 1049243 - Integrate MTP and Device Storage. r=echou
2014-08-28 13:13:06 -07:00
Bobby Holley
7c7704aa07
Bug 1052052 - Hoist Auto*JSContext into nsContentUtils and kill nsCxPusher.{cpp,h}. r=gabor
2014-08-14 18:47:15 -07:00
Szu-Yu Chen [:aknow]
8552ad7429
Bug 1053094 - Part 2: Fix. r=hsinyi
2014-08-14 03:55:00 -04:00
Shawn Ku
bb0ede414b
Bug 1046649 - Part 2: Test patch - B2G RIL: Need to handle wild char for EF_OPL. r=Edgar
2014-08-13 16:54:55 +08:00
Shawn Ku
db2cef7220
Bug 1046649 - Part 1: RIL patch - B2G RIL: Need to handle wild char for EF_OPL. v3. r=Edgar
2014-08-13 17:00:52 +08:00
Seth Fowler
d9a982d9dc
Bug 913586 (Part 4) - Update Maybe users in dom. r=bz
...
--HG--
extra : rebase_source : 7b6159b00b3bf4f919b30f1bccc8939cc04fe526
2014-08-13 15:39:41 -07:00
Szu-Yu Chen [:aknow]
c0aa8ed457
Bug 1050696 - Refactor TelephonyService.dial. r=hsinyi
2014-08-11 02:48:00 -04:00
Szu-Yu Chen [:aknow]
4f0650cc40
Bug 1051663 - Correct |this| in REQUEST_DIAL_EMERGENCY_CALL. r=hsinyi
2014-08-11 02:37:00 -04:00
Jessica Jong
6558f5c791
Bug 1043114 - Part 4: Unify add/removeHostRoute and add/removeHostRouteWithResolve (NetworkUtils). r=edgar
2014-08-08 02:32:00 -04:00
Jessica Jong
7ebf40f279
Bug 1043114 - Part 3.2: Remove unused NetworkParams and refine comments. r=edgar, r=smaug
2014-08-08 02:30:00 -04:00
Jessica Jong
2bf95b6e3d
Bug 1043114 - Part 3.1: Unify add/removeHostRoute and add/removeHostRouteWithResolve (NetworkService). r=edgar
2014-08-06 01:51:00 -04:00
Jessica Jong
92c60f8f82
Bug 1043114 - Part 2: Unify add/removeHostRoute and add/removeHostRouteWithResolve (NetworkManager). r=edgar
2014-08-06 01:46:00 -04:00
Jessica Jong
1b4bb1dd95
Bug 1043114 - Part 1: Unify add/removeHostRoute and add/removeHostRouteWithResolve (idl). f=vchang, r=edgar
2014-08-06 01:45:00 -04:00
Kyle Huey
78c0ad791e
Bug 1050509: Shut down the KeyStore socket during system shutdown to avoid leaks. r=tdz
2014-08-08 11:11:36 -07:00
Gabriele Svelto
6e564c383b
Bug 1050067 - Correctly provide the service code when requesting an IMEI number. r=hsinyi
2014-08-07 23:01:42 +02:00
Jessica Jong
2f73ec4818
Bug 1048723 - B2G RIL: send data registration request one by one. r=hsinyi
2014-08-07 18:38:21 +08:00
Kan-Ru Chen (陳侃如)
e04fb2c40d
Bug 1032063 - Call update_network_state and update_network_availability when network state changes for A-GPS. r=dougt
...
--HG--
extra : rebase_source : 9a674017a74099f3919b27252c454e7ca777ef84
2014-08-06 14:41:56 +08:00
Yoshi Huang
c47835efd2
Bug 933141 - Move NFC files out of system/gonk. r=gps, dimi
...
--HG--
rename : dom/system/gonk/NfcContentHelper.js => dom/nfc/NfcContentHelper.js
rename : dom/system/gonk/Nfc.js => dom/nfc/gonk/Nfc.js
rename : dom/system/gonk/Nfc.manifest => dom/nfc/gonk/Nfc.manifest
rename : dom/system/gonk/NfcGonkMessage.h => dom/nfc/gonk/NfcGonkMessage.h
rename : dom/system/gonk/NfcMessageHandler.cpp => dom/nfc/gonk/NfcMessageHandler.cpp
rename : dom/system/gonk/NfcMessageHandler.h => dom/nfc/gonk/NfcMessageHandler.h
rename : dom/system/gonk/NfcOptions.h => dom/nfc/gonk/NfcOptions.h
rename : dom/system/gonk/NfcService.cpp => dom/nfc/gonk/NfcService.cpp
rename : dom/system/gonk/NfcService.h => dom/nfc/gonk/NfcService.h
rename : dom/system/gonk/nfc_consts.js => dom/nfc/gonk/nfc_consts.js
rename : dom/system/gonk/nsINfcService.idl => dom/nfc/gonk/nsINfcService.idl
rename : dom/system/gonk/nsINfcContentHelper.idl => dom/nfc/nsINfcContentHelper.idl
2014-08-01 17:23:14 +08:00
Vicamo Yang
24f0f50b83
Bug 916607 - 2/4: implementation. r=bzbarsky, r=gene
2014-08-04 17:01:36 +08:00
Vicamo Yang
312ae1d1a4
Bug 1044737 - 2/3: remove unused bits related to 'getNetworkInterfaceStats'. r=bholley, r=vchang
2014-08-01 15:08:42 +08:00
Vicamo Yang
b437b55849
Bug 1044737 - 1/3: don't use Date in nsINetworkStatsCallback::networkStatsAvailable. r=vchang
2014-08-01 15:08:41 +08:00
Yoshi Huang
b3bf86b9f8
Bug 1043186 - Part 2: onpeerlost should be fired to correct target. r=dimi
2014-07-24 18:11:42 +08:00
Yoshi Huang
d096c7322c
Bug 1043186 - Part 1: Add a nsINfcPeerEventListener. r=dimi
2014-07-24 12:16:02 +08:00
Ghislain 'Aus' Lacroix
475fe7ed48
bug 1046876 - Define 'Cu'. r=gwagner
2014-07-31 13:29:14 -07:00
Nathan Froyd
9ea6c585f8
Bug 1042878 - part 2 - move MOZ_CAIRO_CFLAGS et al additions to C*FLAGS into moz.build; r=glandium
2014-07-24 11:55:33 -04:00
Alphan Chen
d1e4089f54
Bug 1039939 - [MTP] Enable functionality on Windows 7. r=dhylands
2014-07-30 13:49:02 +08:00