OSDN Git Service
Jeff Sharkey [Wed, 19 Dec 2012 01:32:10 +0000 (17:32 -0800)]
Clean up oddly quoted NetworkPolicies.
Bug:
7695807
Change-Id: Ia3f04dc3e918d6ca4af62f263a9c90273b3485ff
Jeff Sharkey [Wed, 19 Dec 2012 01:06:23 +0000 (17:06 -0800)]
Fix metered SSID matching regression.
WifiInfo changed to return SSIDs with quotes included, so relax our
identity matching to accept matches regardless of quotedness.
Bug:
7695807
Change-Id: I53c0361f9e44b4d47ec8764991a3cd545c253edd
The Android Open Source Project [Tue, 18 Dec 2012 17:46:45 +0000 (09:46 -0800)]
am
a6dd202d: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
a6dd202da14c2a0e75ea03807458f5c8cd319888':
The Android Open Source Project [Tue, 18 Dec 2012 17:44:44 +0000 (09:44 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934
The Android Automerger [Tue, 18 Dec 2012 04:49:51 +0000 (20:49 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jean Chalard [Mon, 17 Dec 2012 18:48:11 +0000 (10:48 -0800)]
am
5031683a: am
d0a9d5b6: am
a374d816: Distinguish adding an already present word / cancelling
* commit '
5031683a729917ae45047bfc33b7f89705c4c530':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 18:46:29 +0000 (10:46 -0800)]
am
d0a9d5b6: am
a374d816: Distinguish adding an already present word / cancelling
* commit '
d0a9d5b6e0b557c3796616791fd3ac93d12bcad9':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 18:44:36 +0000 (10:44 -0800)]
am
a374d816: Distinguish adding an already present word / cancelling
* commit '
a374d81605f4ba760db9613dd8aa8d8a0370dab8':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 05:58:04 +0000 (14:58 +0900)]
Distinguish adding an already present word / cancelling
Bug:
7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
The Android Open Source Project [Sat, 15 Dec 2012 00:48:47 +0000 (16:48 -0800)]
am
aca1bb4a: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
aca1bb4ab86f3b27df72db37cab6bc3ccca088a9':
The Android Open Source Project [Fri, 14 Dec 2012 22:03:38 +0000 (14:03 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945
The Android Automerger [Fri, 14 Dec 2012 21:56:20 +0000 (13:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mike Cleron [Fri, 14 Dec 2012 19:03:13 +0000 (11:03 -0800)]
am
6d3925ce: am
49ce96a1: am
1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '
6d3925ce5b86c27672289fa8e29bb9229085c1ea':
Call back to whom requested to add a word to the user dict
Mike Cleron [Fri, 14 Dec 2012 19:00:28 +0000 (11:00 -0800)]
am
49ce96a1: am
1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '
49ce96a14be5d414128b9e8ca12de281b610a57f':
Call back to whom requested to add a word to the user dict
Mike Cleron [Fri, 14 Dec 2012 18:59:17 +0000 (10:59 -0800)]
am
1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '
1f597c8764b375bf87d411d11a29b2808e1d2ef9':
Call back to whom requested to add a word to the user dict
Mike Cleron [Fri, 14 Dec 2012 18:57:17 +0000 (10:57 -0800)]
Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
Przemyslaw Szczepaniak [Fri, 14 Dec 2012 14:50:45 +0000 (14:50 +0000)]
Fix for setting app not playing tts sample.
Bug:
7666482
Change-Id: I36a775312d62d3d7a5ee600b540a328b377b46c9
Jean Chalard [Thu, 13 Dec 2012 06:34:11 +0000 (15:34 +0900)]
Call back to whom requested to add a word to the user dict
Bug:
7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
The Android Automerger [Thu, 13 Dec 2012 23:30:57 +0000 (15:30 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Irfan Sheriff [Thu, 13 Dec 2012 19:36:40 +0000 (11:36 -0800)]
am
9c65a7fd: am
878072a1: am
2a9cbb61: am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
9c65a7fdf4c87e10b2bf54ee7ea5bc392d0507c0':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:34:46 +0000 (11:34 -0800)]
am
878072a1: am
2a9cbb61: am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
878072a11a4f481e99cdc499752b72d14a03090d':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:32:51 +0000 (11:32 -0800)]
am
2a9cbb61: am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:30:41 +0000 (11:30 -0800)]
am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
f197105e3bd83a1f244cb690a1aa615624629961':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:28:47 +0000 (11:28 -0800)]
Merge "Fix wifi compareTo" into jb-mr1-dev
Irfan Sheriff [Thu, 29 Nov 2012 20:31:06 +0000 (12:31 -0800)]
Fix wifi compareTo
Bug:
7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
The Android Automerger [Wed, 12 Dec 2012 23:06:22 +0000 (15:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Wed, 12 Dec 2012 21:44:57 +0000 (13:44 -0800)]
am
3af56067: (-s ours) am
efacd47f: am
5b4509b5: Import translations. DO NOT MERGE
* commit '
3af560670fdbe617d4dc0e3f64de1adbb248e84b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:42:57 +0000 (13:42 -0800)]
am
efacd47f: am
5b4509b5: Import translations. DO NOT MERGE
* commit '
efacd47f4f2f9b5103cd3bf876b819904d881da6':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:40:53 +0000 (13:40 -0800)]
am
badaeea8: (-s ours) am
92ff5ebe: Import translations. DO NOT MERGE
* commit '
badaeea8035f06da5568cdc4295b8a343397a804':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:40:49 +0000 (13:40 -0800)]
am
5b4509b5: Import translations. DO NOT MERGE
* commit '
5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:39:37 +0000 (13:39 -0800)]
am
92ff5ebe: Import translations. DO NOT MERGE
* commit '
92ff5ebe1e0bbb58b444c06d3e4b6887a3dbe120':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:38:56 +0000 (13:38 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 12 Dec 2012 21:22:13 +0000 (13:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id0bade447cf518d9c5e523aa597bc432b4d5feac
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Dec 2012 21:19:14 +0000 (13:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Dec 2012 21:17:55 +0000 (13:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4067263fdbd86c2b1037443ad7360fb17cabe56c
Auto-generated-cl: translation import
Amith Yamasani [Wed, 12 Dec 2012 17:57:37 +0000 (09:57 -0800)]
am
004970da: am
0df6a277: Merge "Grey out settings icon when it is in disabled state"
* commit '
004970da50ddbce80321b50536625e149ff1f825':
Grey out settings icon when it is in disabled state
Amith Yamasani [Wed, 12 Dec 2012 17:55:56 +0000 (09:55 -0800)]
am
0df6a277: Merge "Grey out settings icon when it is in disabled state"
* commit '
0df6a2771d92e355e122195d3dceaf9a2b264ee5':
Grey out settings icon when it is in disabled state
Irfan Sheriff [Wed, 12 Dec 2012 17:30:46 +0000 (09:30 -0800)]
Merge "Use updated API"
Amith Yamasani [Wed, 12 Dec 2012 17:12:46 +0000 (09:12 -0800)]
Merge "Grey out settings icon when it is in disabled state"
The Android Open Source Project [Wed, 12 Dec 2012 15:36:21 +0000 (07:36 -0800)]
am
7f5a3d10: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
7f5a3d10f860ee1962c4bb81fa5a552cc5fedc3e':
The Android Open Source Project [Wed, 12 Dec 2012 15:34:17 +0000 (07:34 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ia5cf13610d470a518ce526f8a46cb6241a28d124
Irfan Sheriff [Tue, 11 Dec 2012 19:28:11 +0000 (11:28 -0800)]
Use updated API
Fetch peer details from broadcast instead of querying the whole list
each time
Change-Id: I57d82c9dc977d91675b5e5c99979732c80fb1a09
The Android Automerger [Tue, 11 Dec 2012 23:56:34 +0000 (15:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 23:48:29 +0000 (15:48 -0800)]
Follow API changes.
Bug:
7333397
Change-Id: I72a27dbe02be376ec1c781955e930e87ea59b5a0
Baligh Uddin [Tue, 11 Dec 2012 05:16:16 +0000 (21:16 -0800)]
am
5c806da4: (-s ours) am
777688c9: am
67e9e59b: Import translations. DO NOT MERGE
* commit '
5c806da40c1c3af53d5a777512b67bdb24bb690c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:14:56 +0000 (21:14 -0800)]
am
777688c9: am
67e9e59b: Import translations. DO NOT MERGE
* commit '
777688c9638efab8681453889a3d7917b4a52634':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:14:49 +0000 (21:14 -0800)]
am
e17335e9: (-s ours) am
3b10f0ba: Import translations. DO NOT MERGE
* commit '
e17335e98267b856822499315b9a66aacf1c2f69':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:12:41 +0000 (21:12 -0800)]
am
67e9e59b: Import translations. DO NOT MERGE
* commit '
67e9e59bc943481b091998ba114ca6750f46b383':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:12:02 +0000 (21:12 -0800)]
am
3b10f0ba: Import translations. DO NOT MERGE
* commit '
3b10f0ba055fce7b8893897e88405bff0fb66fca':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:10:31 +0000 (21:10 -0800)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Mon, 10 Dec 2012 23:23:15 +0000 (15:23 -0800)]
am
c9b5f99c: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
c9b5f99c1d1404b02b123771357be32430363ba2':
The Android Open Source Project [Mon, 10 Dec 2012 23:19:47 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I9438d179ff8a407f87b5b501d4ea1d006f2fb77c
Baligh Uddin [Mon, 10 Dec 2012 18:59:51 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7a79e2be8d71ac1a06ec243207fa473ad960d2cb
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Dec 2012 18:57:09 +0000 (10:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Dec 2012 18:55:55 +0000 (10:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1f403d01d8d3d7336d869555e69af22b460f7a37
Auto-generated-cl: translation import
Elliott Hughes [Sat, 8 Dec 2012 18:59:12 +0000 (10:59 -0800)]
am
68066a78: am
e2d893e2: Merge "Makes the add button for new APNs appear in the action bar."
* commit '
68066a78352ea6b147767e84a5481764f0054f2b':
Makes the add button for new APNs appear in the action bar.
Elliott Hughes [Sat, 8 Dec 2012 18:57:51 +0000 (10:57 -0800)]
am
e2d893e2: Merge "Makes the add button for new APNs appear in the action bar."
* commit '
e2d893e2af36e4ede8d1ec074912563ae6ecf7ef':
Makes the add button for new APNs appear in the action bar.
Elliott Hughes [Sat, 8 Dec 2012 17:55:08 +0000 (09:55 -0800)]
Merge "Makes the add button for new APNs appear in the action bar."
Amith Yamasani [Fri, 7 Dec 2012 22:20:16 +0000 (14:20 -0800)]
Merge "Don't do the developer options countdown for secondary users."
Amith Yamasani [Fri, 7 Dec 2012 22:18:28 +0000 (14:18 -0800)]
Don't do the developer options countdown for secondary users.
Bug:
7469031
Change-Id: I794cb8b67a9221cc4fcd2dd6208777648c818fe0
The Android Automerger [Fri, 7 Dec 2012 21:26:24 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Wink Saville [Fri, 7 Dec 2012 20:21:45 +0000 (12:21 -0800)]
am
4e0391a7: am
49c4de7f: Merge "Format change at "Mobile network type" value"
* commit '
4e0391a733a3c5ba0c23c00c165aeb580426cee1':
Format change at "Mobile network type" value
Wink Saville [Fri, 7 Dec 2012 20:18:53 +0000 (12:18 -0800)]
am
49c4de7f: Merge "Format change at "Mobile network type" value"
* commit '
49c4de7f139a1a3a60dc8f7e72acae710dba506f':
Format change at "Mobile network type" value
Baligh Uddin [Fri, 7 Dec 2012 19:48:10 +0000 (11:48 -0800)]
am
f1eb2f44: (-s ours) am
957f7fc9: am
3674d869: Import translations. DO NOT MERGE
* commit '
f1eb2f4498ce6e10c3b72c3a3cb47a80eba1959e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:47:42 +0000 (11:47 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 7 Dec 2012 19:46:45 +0000 (11:46 -0800)]
am
4377b807: (-s ours) am
29ce5561: Import translations. DO NOT MERGE
* commit '
4377b80732d89ba10211ceff206517cf3c9ca875':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:45:54 +0000 (11:45 -0800)]
am
957f7fc9: am
3674d869: Import translations. DO NOT MERGE
* commit '
957f7fc94eaab5d57d82c76a3a06acd0ab2dc018':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:44:30 +0000 (11:44 -0800)]
am
29ce5561: Import translations. DO NOT MERGE
* commit '
29ce5561d85c121c293acc13b60a291365679a46':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:44:18 +0000 (11:44 -0800)]
am
3674d869: Import translations. DO NOT MERGE
* commit '
3674d8695166be6c0b7cc225f227f9e1604056e8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:38:03 +0000 (11:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7b1104d9f823970bc78cbd8681c67b300057f61b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Dec 2012 19:35:18 +0000 (11:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Dec 2012 19:34:10 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic8bff7a52926a927353fa5933a68dfc17921e6d1
Auto-generated-cl: translation import
Amith Yamasani [Fri, 7 Dec 2012 18:47:45 +0000 (10:47 -0800)]
am
b722b80d: am
b7d94e74: am
aeb57eda: Pass the locale code in the help url for help pages.
* commit '
b722b80da8481a1570dbe4be89b8ed70daec6b41':
Pass the locale code in the help url for help pages.
Amith Yamasani [Fri, 7 Dec 2012 18:45:30 +0000 (10:45 -0800)]
am
b7d94e74: am
aeb57eda: Pass the locale code in the help url for help pages.
* commit '
b7d94e74e1342c5583883e596fd268745a5a25b6':
Pass the locale code in the help url for help pages.
Amith Yamasani [Fri, 7 Dec 2012 18:43:37 +0000 (10:43 -0800)]
am
aeb57eda: Pass the locale code in the help url for help pages.
* commit '
aeb57edaef1abdcdcd21eb443047386940ffb755':
Pass the locale code in the help url for help pages.
Amith Yamasani [Thu, 6 Dec 2012 22:40:51 +0000 (14:40 -0800)]
Pass the locale code in the help url for help pages.
Otherwise the help will always be shown in English.
Bug:
7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
Wink Saville [Thu, 6 Dec 2012 16:51:22 +0000 (08:51 -0800)]
Merge "Format change at "Mobile network type" value"
Akira Oshimi [Thu, 18 Oct 2012 09:14:00 +0000 (18:14 +0900)]
Format change at "Mobile network type" value
Remove "network type Number" from "mobile network type" value
at "About Phone > Status".
For example value "UNKNOWN:0" became "UNKNOWN"
(if value is "UNKNOWN", the word is localized)
The number ":0" did not add much value to the user.
Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
The Android Open Source Project [Wed, 5 Dec 2012 21:01:02 +0000 (13:01 -0800)]
am
1aa371fc: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
1aa371fcaf8ddec7fbd4368bd13420eaf3e5b1b6':
Jake Hamby [Wed, 5 Dec 2012 20:29:03 +0000 (12:29 -0800)]
am
ac9bb0bd: am
b39ab37a: am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
ac9bb0bdc0c2ef42d259e555187061a0ea95c8f2':
Add latest area info broadcast to Settings status screen.
Baligh Uddin [Wed, 5 Dec 2012 20:23:11 +0000 (12:23 -0800)]
am
e912b763: (-s ours) am
e30adf2f: am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
e912b763ee9e631129512162c3e934aaf4bc1e91':
Import translations. DO NOT MERGE
The Android Open Source Project [Wed, 5 Dec 2012 19:10:16 +0000 (11:10 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I2333de9f3a171fef3c806003d0e662570d01af1e
The Android Automerger [Wed, 5 Dec 2012 18:27:58 +0000 (10:27 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Wed, 5 Dec 2012 16:25:27 +0000 (08:25 -0800)]
am
482dd21c: (-s ours) am
9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
482dd21ca2ccd350957dba3cf7d207a8533a9bdf':
Import translations. DO NOT MERGE
Jake Hamby [Wed, 5 Dec 2012 04:09:34 +0000 (20:09 -0800)]
am
b39ab37a: am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
b39ab37aa0e8be02a61c4245c181e523419ba703':
Add latest area info broadcast to Settings status screen.
Jake Hamby [Wed, 5 Dec 2012 04:08:21 +0000 (20:08 -0800)]
am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
bc5d9271a9d36ecf07ac35e1635f36679074de6f':
Add latest area info broadcast to Settings status screen.
The Android Automerger [Wed, 5 Dec 2012 03:59:27 +0000 (19:59 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jake Hamby [Tue, 4 Dec 2012 01:24:30 +0000 (17:24 -0800)]
Add latest area info broadcast to Settings status screen.
When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.
Bug:
7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
Baligh Uddin [Wed, 5 Dec 2012 00:34:48 +0000 (16:34 -0800)]
am
e30adf2f: am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
e30adf2f65241b6337dc4090631673a2fec904e1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 5 Dec 2012 00:31:30 +0000 (16:31 -0800)]
am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
d2bd59f5e8e2359e6697dd8975ccfd1aa36b4103':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 21:49:33 +0000 (13:49 -0800)]
am
9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
9a2cee1d1e391147b3e21d10549b190ba79c4199':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 21:47:16 +0000 (13:47 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 4 Dec 2012 21:46:55 +0000 (13:46 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 19:16:12 +0000 (11:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925
Auto-generated-cl: translation import
Baligh Uddin [Tue, 4 Dec 2012 19:14:54 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I950a025ffdb3ac8cb21a9e80175eef115ddac9d4
Auto-generated-cl: translation import
Daniel Sandler [Tue, 4 Dec 2012 19:06:53 +0000 (11:06 -0800)]
am
1c7c8242: am
5428ce65: am
300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
* commit '
1c7c8242ae946c102aca7737cd85ab743aabcb74':
Revised language for notification ringtone picker.
Daniel Sandler [Tue, 4 Dec 2012 19:04:57 +0000 (11:04 -0800)]
am
5428ce65: am
300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
* commit '
5428ce650b161f5a4dfdccb2b4a54f18544e4068':
Revised language for notification ringtone picker.
Daniel Sandler [Tue, 4 Dec 2012 19:02:18 +0000 (11:02 -0800)]
am
300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
* commit '
300f8299a6085e295e288d535ad3b8fd0ccbb1cf':
Revised language for notification ringtone picker.
Daniel Sandler [Tue, 4 Dec 2012 19:00:59 +0000 (11:00 -0800)]
Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 16:21:43 +0000 (08:21 -0800)]
am
1e9dea67: (-s ours) am
613b168d: am
d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
1e9dea67c93b8791a60e201ecdb5b7372c82cec6':
Import translations. DO NOT MERGE