Commit Graph

8648 Commits

Author SHA1 Message Date
Baligh Uddin
28be694aa0 Import translations. DO NOT MERGE
Change-Id: Idde76e1ee183e5d2acadc98d6e100b4d85032313
Auto-generated-cl: translation import
2012-10-05 16:31:58 -07:00
The Android Open Source Project
31f2cb77c4 am 3ddc5049: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '3ddc5049fccffa0fee9670d2833318ff35121c8d':
2012-10-05 08:20:53 -07:00
The Android Open Source Project
3ddc5049fc Reconcile with jb-mr1-release - do not merge
Change-Id: Id2efe6503779bfb18d403b49dfaac9ad9f392bc3
2012-10-05 08:18:21 -07:00
The Android Automerger
6a2bf2a8cd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 07:00:19 -07:00
Baligh Uddin
9fff3f5790 am 62a725f9: (-s ours) am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '62a725f9c3f01e846b5f27d851349d92f6af2d5f':
  Import translations. DO NOT MERGE
2012-10-04 22:26:07 -07:00
Baligh Uddin
62a725f9c3 am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'babf1a4348cb94a1dfadf4c454452d67f27dfdc6':
  Import translations. DO NOT MERGE
2012-10-04 22:23:48 -07:00
Baligh Uddin
127254ab5f am e8d64472: (-s ours) am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'e8d64472319dbc6e67ce964e8712dc0a676298ae':
  Import translations. DO NOT MERGE
2012-10-04 22:22:59 -07:00
Baligh Uddin
babf1a4348 am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '9d90489078b406d3a52e27ef517278e15f603f76':
  Import translations. DO NOT MERGE
2012-10-04 22:21:01 -07:00
Baligh Uddin
e8d6447231 am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '3d72d169568665b7aa08342c9392fe7f2326cfa8':
  Import translations. DO NOT MERGE
2012-10-04 22:20:53 -07:00
Baligh Uddin
fc2f177971 Merge "Import translations. DO NOT MERGE" 2012-10-04 22:19:35 -07:00
Baligh Uddin
9d90489078 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 22:19:15 -07:00
Baligh Uddin
3d72d16956 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 22:18:41 -07:00
Amith Yamasani
af721bbb49 am 16fd6059: am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
* commit '16fd6059eeed4f9d1b7e4fac3b5a0fe9686d2229':
  Move the position of widget choosers to below lockscreen settings in Security
2012-10-04 22:02:36 -07:00
Amith Yamasani
16fd6059ee am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
* commit '42171a2cc68da0f45b7828eb766a9c73e173e6b2':
  Move the position of widget choosers to below lockscreen settings in Security
2012-10-04 22:00:25 -07:00
Amith Yamasani
42171a2cc6 am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
* commit '6fd359d8f66e9a2fea45251e52b7a6b07561705b':
  Move the position of widget choosers to below lockscreen settings in Security
2012-10-04 21:58:07 -07:00
Amith Yamasani
6fd359d8f6 Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev 2012-10-04 21:56:04 -07:00
Charles Chen
5e4b82452a am 464a0078: am fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
* commit '464a0078b1f72a3a069f80b4aeca4644eef02eaa':
  Announce dynamic content changes in lock confirmation settings.
2012-10-04 20:34:16 -07:00
Charles Chen
464a0078b1 am fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
* commit 'fdab8bd9dabe3cb70453a58af68d5f2ce23b44c4':
  Announce dynamic content changes in lock confirmation settings.
2012-10-04 18:35:47 -07:00
Charles Chen
fdab8bd9da am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
* commit '992e0b8537e4fa2f6f6941f7e21d142c40499e7a':
  Announce dynamic content changes in lock confirmation settings.
2012-10-04 18:33:43 -07:00
Charles Chen
992e0b8537 Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev 2012-10-04 18:32:30 -07:00
Dianne Hackborn
68d4d87e5a am 7b1d707f: am 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev
* commit '7b1d707f9706acc2500b13df7961c8db6338e24a':
  Fix issue #7226978: Still in app detail screen after uninstall
2012-10-04 17:26:02 -07:00
Dianne Hackborn
7b1d707f97 am 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev
* commit '8416f45384b5c0ebd24aca0913793820dcc3def4':
  Fix issue #7226978: Still in app detail screen after uninstall
2012-10-04 17:24:34 -07:00
Dianne Hackborn
8416f45384 am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev
* commit '2c41f7be44715483de4d3e9c8a91488c4f723e90':
  Fix issue #7226978: Still in app detail screen after uninstall
2012-10-04 17:22:32 -07:00
Dianne Hackborn
2c41f7be44 Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev 2012-10-04 17:20:45 -07:00
Jeff Sharkey
51e6e175ed am a5b6ba8a: am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
* commit 'a5b6ba8afb7a81ca975d58c61fc152e11a34871f':
  Refresh authenticator info when accounts change.
2012-10-04 16:47:14 -07:00
Jeff Sharkey
a5b6ba8afb am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
* commit 'ef62a19855cbfac35ba1c4b1a14caa75e271b512':
  Refresh authenticator info when accounts change.
2012-10-04 16:44:42 -07:00
Jeff Sharkey
ef62a19855 am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
* commit '113e4b6aa1dfbc49abdf6366909ceb4a6923d114':
  Refresh authenticator info when accounts change.
2012-10-04 16:42:27 -07:00
Jeff Sharkey
113e4b6aa1 Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 2012-10-04 16:40:25 -07:00
Amith Yamasani
8f6060f639 Move the position of widget choosers to below lockscreen settings in Security
Bug: 7261302

Move the 2 widget options on lockscreen to below the lock related items, just
above the Owner Info item.

Change-Id: I373b915e15bc93ce7e56f5982999afa1e5aed281
2012-10-04 16:21:36 -07:00
Dianne Hackborn
ab616d477b Fix issue #7226978: Still in app detail screen after uninstall
Change-Id: I3b03db0a68bfab5dd010474ee714d5f7a5538af0
2012-10-04 15:44:50 -07:00
Baligh Uddin
0974c0aabe Import translations. DO NOT MERGE
Change-Id: I3c441df6a35ab942ed6467ae938baa18f719a1f7
Auto-generated-cl: translation import
2012-10-04 15:02:57 -07:00
Baligh Uddin
eabf97657b Import translations. DO NOT MERGE
Change-Id: I1d77c147969acf45abfa5eb4924fb20639d409ee
Auto-generated-cl: translation import
2012-10-04 15:00:03 -07:00
Baligh Uddin
ad5454ff3b Import translations. DO NOT MERGE
Change-Id: I9d3249b9c3962ef225c8f7566f8aa96805d89355
Auto-generated-cl: translation import
2012-10-04 14:58:30 -07:00
Baligh Uddin
92c45de11a am 484cbeba: (-s ours) am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '484cbebafd3d4e2456f4fa0b82fffbb7987ba0ae':
  Import translations. DO NOT MERGE
2012-10-04 10:44:35 -07:00
Baligh Uddin
484cbebafd am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'f55a3a1e3464a79fc4cf080fac8903a566373960':
  Import translations. DO NOT MERGE
2012-10-04 10:43:34 -07:00
Baligh Uddin
f55a3a1e34 am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '27636444a4be011a6a813cba6429e58629316ce4':
  Import translations. DO NOT MERGE
2012-10-04 10:40:56 -07:00
Baligh Uddin
c8f223ca69 Merge "Import translations. DO NOT MERGE" 2012-10-04 10:39:12 -07:00
Baligh Uddin
27636444a4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:38:54 -07:00
Baligh Uddin
eb8a8b87e8 am a35de94f: (-s ours) am 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'a35de94f80b87030dc0a953ac8e5e7d2d991378f':
  Import translations. DO NOT MERGE
2012-10-04 10:05:35 -07:00
Baligh Uddin
a35de94f80 am 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '771daf38ea35c670f2eac8512d8058daaec1434f':
  Import translations. DO NOT MERGE
2012-10-04 10:02:15 -07:00
Baligh Uddin
771daf38ea Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 10:00:58 -07:00
The Android Open Source Project
18e357cd2e am 90870780: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '90870780c8019d67c2abd502dba3a92dce91bebe':
2012-10-04 07:52:38 -07:00
The Android Open Source Project
90870780c8 Reconcile with jb-mr1-release - do not merge
Change-Id: Ic92ccbe7031853f464542711f57fcf1e1d7112fb
2012-10-04 07:50:00 -07:00
The Android Automerger
9958d3582d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 07:00:18 -07:00
Baligh Uddin
1e12997cdd Import translations. DO NOT MERGE
Change-Id: Id5af20206cbddba6f19716c027f1ef279038d696
Auto-generated-cl: translation import
2012-10-03 21:25:27 -07:00
Baligh Uddin
8948fa5090 Import translations. DO NOT MERGE
Change-Id: I5e5c043d16bb59b50b4341a44827c824c564786c
Auto-generated-cl: translation import
2012-10-03 21:23:00 -07:00
Baligh Uddin
48be9aa3a8 Import translations. DO NOT MERGE
Change-Id: I65e354b797114c305fdce72fd57ee8039e16630a
Auto-generated-cl: translation import
2012-10-03 21:21:22 -07:00
Amith Yamasani
a3bc45b258 am dc592eeb: am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
* commit 'dc592eebf125ac71c1b45ad1b6e797a1787d0528':
  No decoration for WifiSetup activity used by SetupWizard
2012-10-03 17:56:43 -07:00
Amith Yamasani
dc592eebf1 am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
* commit '8a55b2d545d9e2d10afc2f5bf98e0ea6f43182de':
  No decoration for WifiSetup activity used by SetupWizard
2012-10-03 17:54:56 -07:00
Amith Yamasani
8a55b2d545 am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
* commit '875fa8affb0f3b0ac39120833a7778f92c97b965':
  No decoration for WifiSetup activity used by SetupWizard
2012-10-03 17:52:59 -07:00