OSDN Git Service
Elliott Hughes [Tue, 22 Jan 2013 16:03:32 +0000 (08:03 -0800)]
am
d7d5b33b: am
375b6d98: Merge "Force closed at settings application when delete Misc files"
* commit '
d7d5b33bcd78680d475c92fca7bafc4ac4279621':
Force closed at settings application when delete Misc files
Elliott Hughes [Tue, 22 Jan 2013 15:58:42 +0000 (07:58 -0800)]
am
375b6d98: Merge "Force closed at settings application when delete Misc files"
* commit '
375b6d985be9203fb221eb42810e586e196c34f8':
Force closed at settings application when delete Misc files
Elliott Hughes [Tue, 22 Jan 2013 15:43:05 +0000 (15:43 +0000)]
Merge "Force closed at settings application when delete Misc files"
Irfan Sheriff [Sat, 19 Jan 2013 18:16:35 +0000 (18:16 +0000)]
Merge "Allow only valid EAP configs"
Dianne Hackborn [Fri, 18 Jan 2013 18:52:38 +0000 (10:52 -0800)]
Improve app ops UI.
Merge app entries together some.
Also a little weekend present for swetland.
Change-Id: Ie2b6654d9de0b9eeaafbf4b070845353c130b9c1
Irfan Sheriff [Thu, 17 Jan 2013 17:47:45 +0000 (09:47 -0800)]
Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.
Allow only support configs for various EAP methods
Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
Predrag Stanojevic [Tue, 15 May 2012 13:01:02 +0000 (15:01 +0200)]
Force closed at settings application when delete Misc files
NullPointerException in MiscFilesHandler.java, missing check to
ensure that dir.list() does not return null.
Change-Id: I13aac19949826b385610fd1fee2befb411684023
Chris Craik [Thu, 17 Jan 2013 23:45:33 +0000 (23:45 +0000)]
Merge "Remove now obsolete tracing options"
Chris Craik [Thu, 17 Jan 2013 19:23:48 +0000 (11:23 -0800)]
Remove now obsolete tracing options
Change-Id: I8bd79161e0cb88619e2713b18c5f94cc1a12cb87
Russell Brenner [Thu, 17 Jan 2013 18:05:43 +0000 (18:05 +0000)]
Merge "Stop hijacking strings from Setup Wizard"
Russell Brenner [Thu, 17 Jan 2013 18:05:12 +0000 (18:05 +0000)]
Merge "Revised text for skipping wifi"
Fabrice Di Meglio [Thu, 17 Jan 2013 16:33:25 +0000 (16:33 +0000)]
Merge "Fix Switches padding for Settings app"
Dianne Hackborn [Thu, 17 Jan 2013 02:52:17 +0000 (02:52 +0000)]
Merge "Show all apps that can perform an op."
Dianne Hackborn [Thu, 17 Jan 2013 02:49:48 +0000 (18:49 -0800)]
Show all apps that can perform an op.
Change-Id: Ic4c6fdbc5b345c890a2f41a00b4b5c11272702d7
Amith Yamasani [Wed, 16 Jan 2013 23:28:05 +0000 (23:28 +0000)]
Merge "Use bindServiceAsUser() to follow API change."
Russell Brenner [Wed, 16 Jan 2013 22:39:43 +0000 (14:39 -0800)]
Stop hijacking strings from Setup Wizard
Some UX behavior was moved from Setup Wizard to Wi-Fi Settings after
the localization deadline, so the existing string resources were
leveraged by way of their msgid attributes. In most cases, the
original strings are no longer needed in Setup Wizard and are being
removed from there in a separate CL.
Bug:
8020975
Change-Id: Ibd7625c7335ed3c8823b637a452585f5c70e965a
Russell Brenner [Wed, 16 Jan 2013 22:17:26 +0000 (14:17 -0800)]
Revised text for skipping wifi
Also stopped using msgid's for these two strings from SetupWizard,
which was done to repurpose existing strings after the localization
deadline.
Bug:
7350454
Change-Id: I575937b4fa5d15a6cac4c9cb60cf2d8741c7f774
Amith Yamasani [Wed, 16 Jan 2013 20:34:16 +0000 (12:34 -0800)]
Use bindServiceAsUser() to follow API change.
Change-Id: Ib12f1dcf7f3a5df7e166b732e1c29e7e9d0869ed
Dianne Hackborn [Wed, 16 Jan 2013 03:02:05 +0000 (19:02 -0800)]
Quick and dirty UI for viewing app op information.
Change-Id: If17bfbe84cf438ca9bb37bf446564f39de99cee1
Fabrice Di Meglio [Wed, 16 Jan 2013 02:54:11 +0000 (18:54 -0800)]
Fix Switches padding for Settings app
- use setPaddingRelative() instead of setPadding()
Change-Id: Ifd14193a5f60d303035b394616dc65a70e1ef5f9
Baligh Uddin [Tue, 15 Jan 2013 17:33:31 +0000 (09:33 -0800)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Tue, 15 Jan 2013 17:03:20 +0000 (09:03 -0800)]
Merge "Update enterprise API usage"
Baligh Uddin [Tue, 15 Jan 2013 02:03:58 +0000 (18:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I520b61f5ffc00be86776506400bfa59019f999c8
Auto-generated-cl: translation import
Irfan Sheriff [Fri, 11 Jan 2013 22:12:54 +0000 (14:12 -0800)]
Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen
Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
Jeff Sharkey [Sat, 12 Jan 2013 22:17:38 +0000 (14:17 -0800)]
Merge "Invert split action bar logic."
Jeff Brown [Sat, 12 Jan 2013 00:01:29 +0000 (16:01 -0800)]
Merge "Support wifi display settings on tablets."
Jeff Brown [Fri, 11 Jan 2013 23:29:27 +0000 (15:29 -0800)]
Support wifi display settings on tablets.
Bug:
7612891
Change-Id: Ie1268f97e4c28cd9a321a966cd6952bd2a9bc281
Fabrice Di Meglio [Fri, 11 Jan 2013 19:16:40 +0000 (11:16 -0800)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)"
Jeff Sharkey [Wed, 28 Nov 2012 00:42:27 +0000 (16:42 -0800)]
Invert split action bar logic.
The majority of Settings activities don't want split action bars, so
invert the logic to be opt-in instead of opt-out.
Bug:
7545845
Change-Id: I794f6df911dda61904e02a0f6b917ab92c846293
Fabrice Di Meglio [Fri, 11 Jan 2013 19:11:00 +0000 (11:11 -0800)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- mirror more icons: avatar for multi user. brightness, cellphone, network signal, language,
application, wifi lock, phone call
Change-Id: Ida6d3ce898a49e7fb88545b84c5171106fce4e9d
Romain Guy [Fri, 11 Jan 2013 02:41:40 +0000 (18:41 -0800)]
Merge "Add new profiling graph type"
Romain Guy [Fri, 11 Jan 2013 02:39:12 +0000 (18:39 -0800)]
Add new profiling graph type
Change-Id: I37945e7668174f62545a8c8fb96e0ee68751a24e
Fabrice Di Meglio [Fri, 11 Jan 2013 00:46:38 +0000 (16:46 -0800)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)"
Fabrice Di Meglio [Thu, 10 Jan 2013 22:09:16 +0000 (14:09 -0800)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- mirror sound icon
Change-Id: Id0104b0662c90f516af159982611114572794651
Baligh Uddin [Wed, 9 Jan 2013 19:45:34 +0000 (11:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I982475662504037faf32a1f3a035aca38e45f782
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Jan 2013 17:52:13 +0000 (09:52 -0800)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Mon, 7 Jan 2013 23:20:51 +0000 (15:20 -0800)]
Merge "Allow underscore in proxy hostnames"
Irfan Sheriff [Mon, 7 Jan 2013 22:23:07 +0000 (14:23 -0800)]
Allow underscore in proxy hostnames
Some proxies use underscore and we should allow configuring them
Change-Id: I6b4eeac7d486ff1eb10cc14cee5ef36db0f9e278
Romain Guy [Mon, 7 Jan 2013 19:20:49 +0000 (11:20 -0800)]
Change "track frame time property" to a list preference
The preference can now be used to disable GPU profiling, expose
profiling data to dumpsys gfxinfo or display that data on screen.
Change-Id: Ib77e9695445fae4a7419667716e92bcc196437df
Baligh Uddin [Mon, 7 Jan 2013 18:15:55 +0000 (10:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I717baee570b22b75416ebe012654e432c706ccd4
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Jan 2013 21:44:46 +0000 (13:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I23a0fe1f0bc3f044d2f028a621cb1070bcecb5fa
Auto-generated-cl: translation import
Amith Yamasani [Tue, 18 Dec 2012 17:32:22 +0000 (09:32 -0800)]
Refresh battery stats when the battery state or charge level changes.
This will keep them in sync. We still don't automatically update
the stats periodically, in case the user is investigating some
behavior. That's why we have a refresh button.
Bug:
7737824
Change-Id: I8a59cad6c72f540533b3526fc476260465c73492
Elliott Hughes [Thu, 20 Dec 2012 19:06:47 +0000 (11:06 -0800)]
am
52d623ed: am
f141594c: Merge "Correct check box visibility in Display / Brightness"
* commit '
52d623ede4a697259b1b3506b0464941e376218e':
Correct check box visibility in Display / Brightness
Elliott Hughes [Thu, 20 Dec 2012 19:03:50 +0000 (11:03 -0800)]
am
f141594c: Merge "Correct check box visibility in Display / Brightness"
* commit '
f141594c0507dccd26e876bf2cd40ba15a34d68b':
Correct check box visibility in Display / Brightness
Elliott Hughes [Thu, 20 Dec 2012 00:11:15 +0000 (16:11 -0800)]
Merge "Correct check box visibility in Display / Brightness"
Jeff Sharkey [Wed, 19 Dec 2012 01:44:05 +0000 (17:44 -0800)]
One final pass at unquoted NetworkPolicies.
Correctly shows the metered status of legacy policies in UI.
Bug:
7695807
Change-Id: I13c9f4c1716d8457343c41433afac0b5f00e02fe
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
Benn Porscke [Wed, 17 Oct 2012 17:01:11 +0000 (19:01 +0200)]
Correct check box visibility in Display / Brightness
The check box for "Automatic brightness" should not be visible in
Brightness screen if the product configuration
config_automatic_brightness_available in config.xml is set to false.
Change-Id: I0d81137723d0eacd97aa88bf08b69e12dd4d73fa
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
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
OSDN Git Service
