Commit Graph

7685 Commits

Author SHA1 Message Date
Baligh Uddin
f39ce2cbd3 am ccc71934: (-s ours) am d75b776a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'ccc7193490db24fe6346a6023686cdd708301975':
  Import translations. DO NOT MERGE
2012-08-21 12:00:49 -07:00
Baligh Uddin
ccc7193490 am d75b776a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'd75b776a7c2cb741793cfa5d1af524db96b738ef':
  Import translations. DO NOT MERGE
2012-08-21 11:58:52 -07:00
Baligh Uddin
d75b776a7c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-21 11:57:12 -07:00
Baligh Uddin
8844edf98a Import translations. DO NOT MERGE
Change-Id: I4beb9abb9778e82144be702dbab151a9e47f9c4e
Auto-generated-cl: translation import
2012-08-21 11:55:13 -07:00
Dianne Hackborn
7798f3c7eb am 5a91b134: am d44b53e3: Merge "Make manage apps UI multi-user aware." into jb-mr1-dev
* commit '5a91b13426f55d2289e25dda2c1ade769cb10bec':
  Make manage apps UI multi-user aware.
2012-08-21 11:23:02 -07:00
Dianne Hackborn
5a91b13426 am d44b53e3: Merge "Make manage apps UI multi-user aware." into jb-mr1-dev
* commit 'd44b53e37abed9632d30df37259b3efcb10332aa':
  Make manage apps UI multi-user aware.
2012-08-21 11:21:11 -07:00
Dianne Hackborn
d44b53e37a Merge "Make manage apps UI multi-user aware." into jb-mr1-dev 2012-08-21 11:19:17 -07:00
Dianne Hackborn
271c8b06c2 Make manage apps UI multi-user aware.
The details screens still need some work.

Change-Id: I850cc9ba9a8db7787fae629ae3cb6c6772c726f5
2012-08-21 11:14:04 -07:00
Jake Hamby
3a4177c940 am 785a81ee: am 0141872d: am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit '785a81ee2b3a34e5af8b3ad4714e2126ab032fb8':
  Enable "APN roaming protocol" for all platforms
2012-08-20 18:11:34 -07:00
Jake Hamby
785a81ee2b am 0141872d: am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit '0141872d29945e85733eee74222d207ff9b80608':
  Enable "APN roaming protocol" for all platforms
2012-08-20 18:09:40 -07:00
Jake Hamby
0141872d29 am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit '0de311b4956acc6ec05d25707f1075c1b8a38280':
  Enable "APN roaming protocol" for all platforms
2012-08-20 18:08:02 -07:00
Jake Hamby
0de311b495 am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit 'c46455ac7a2ad988700f975bb07558c8580bbe8e':
  Enable "APN roaming protocol" for all platforms
2012-08-20 18:06:25 -07:00
Jake Hamby
c46455ac7a Merge "Enable "APN roaming protocol" for all platforms" 2012-08-20 17:27:36 -07:00
Brian Muramatsu
e64c8a5e3a am 391e125a: am e54660d8: Merge "display wireless charging status" into jb-mr1-dev
* commit '391e125a111b1eadfa3bd88956f7d71dce99dbda':
  display wireless charging status
2012-08-20 17:01:23 -07:00
Brian Muramatsu
391e125a11 am e54660d8: Merge "display wireless charging status" into jb-mr1-dev
* commit 'e54660d8b66e5c3aebbeefbb727386602714c621':
  display wireless charging status
2012-08-20 16:59:50 -07:00
Brian Muramatsu
e54660d8b6 Merge "display wireless charging status" into jb-mr1-dev 2012-08-20 16:58:31 -07:00
Baligh Uddin
22530a1622 am 097593e5: (-s ours) am 5fdc5264: Import translations. DO NOT MERGE
* commit '097593e553a3c2da956c6470c3b099dff568bb52':
  Import translations. DO NOT MERGE
2012-08-20 14:52:52 -07:00
Baligh Uddin
097593e553 am 5fdc5264: Import translations. DO NOT MERGE
* commit '5fdc526426f6250bda522235a6db56548c89cb0a':
  Import translations. DO NOT MERGE
2012-08-20 14:51:17 -07:00
Baligh Uddin
c8f0817f78 Import translations. DO NOT MERGE
Change-Id: Id150553c2cec9c5b01ade4ee02840b57ea47e696
Auto-generated-cl: translation import
2012-08-20 10:38:22 -07:00
Baligh Uddin
5fdc526426 Import translations. DO NOT MERGE
Change-Id: Idd1ece233eb5daf32683069ca5daa04718769c87
Auto-generated-cl: translation import
2012-08-20 10:35:09 -07:00
Baligh Uddin
505dbc4562 am 6e6a468c: (-s ours) am c76bfb92: Import translations. DO NOT MERGE
* commit '6e6a468c7f17ef911bd89aa6dcebb20a150ff003':
  Import translations. DO NOT MERGE
2012-08-17 15:59:55 -07:00
Baligh Uddin
6e6a468c7f am c76bfb92: Import translations. DO NOT MERGE
* commit 'c76bfb9243d7fae3f2f6f785685f709c28b41097':
  Import translations. DO NOT MERGE
2012-08-17 15:57:59 -07:00
Baligh Uddin
a6c98f57a6 Import translations. DO NOT MERGE
Change-Id: I04bc114ed968e33f2bba9046d31dc310164edb94
Auto-generated-cl: translation import
2012-08-17 12:11:58 -07:00
Baligh Uddin
c76bfb9243 Import translations. DO NOT MERGE
Change-Id: Id94a81adfd0845198795a16aaeb3b29fe7db1807
Auto-generated-cl: translation import
2012-08-17 12:09:22 -07:00
Jean-Baptiste Queru
d9125340b9 am db326267: am b40815c1: am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit 'db3262676ed903f49d8dc4e4908e5265ab722a25':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:59:48 -07:00
Jean-Baptiste Queru
06a5ea9c4a am ba094d3f: am 43231f2d: am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit 'ba094d3fd32f97e46b29aedb6fe391de711eb8da':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:59:47 -07:00
Jean-Baptiste Queru
db3262676e am b40815c1: am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit 'b40815c150fb3b4a53e7447d249316e3b3fc9502':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:58:08 -07:00
Jean-Baptiste Queru
ba094d3fd3 am 43231f2d: am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit '43231f2d6edef60859ffd3d92d43afe48f5916f6':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:58:07 -07:00
Jean-Baptiste Queru
b40815c150 am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit '71742eb13276e93d18f6aead10a8f767134ab0af':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:57:04 -07:00
Jean-Baptiste Queru
43231f2d6e am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit 'f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:57:03 -07:00
Jean-Baptiste Queru
71742eb132 am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit '0c869d694b59a55c8d53b57a12393b55530e798e':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:55:52 -07:00
Jean-Baptiste Queru
f4cc034e8c am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:55:51 -07:00
Jean-Baptiste Queru
0c869d694b Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 2012-08-17 08:51:18 -07:00
Jean-Baptiste Queru
d61c23b3c2 Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 2012-08-17 08:51:14 -07:00
The Android Open Source Project
8daf56d33f am f9b00a84: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f9b00a844d6fc0d23ce62d42553b4fe180aec261':
2012-08-16 19:13:11 -07:00
The Android Open Source Project
f9b00a844d Reconcile with jb-mr1-release - do not merge
Change-Id: I6e4530661a9c7119cc4082297def851f063112c7
2012-08-16 19:11:13 -07:00
The Android Open Source Project
a48b0a04ab am 32707597: (-s ours) am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '32707597009c6a7b15113fb7dd4e89e029e96ff1':
2012-08-16 19:04:34 -07:00
The Android Open Source Project
3270759700 am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'c8cd7d9335863d19a0a37569a4a539f13ebd1858':
2012-08-16 19:01:50 -07:00
The Android Open Source Project
c8cd7d9335 am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41':
2012-08-16 18:59:04 -07:00
The Android Open Source Project
8543723f37 Reconcile with jb-mr0-release - do not merge
Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba
2012-08-16 18:57:02 -07:00
The Android Automerger
7a6674d1b1 merge in jb-mr0-release history after reset to jb-dev 2012-08-16 17:57:52 -07:00
Baligh Uddin
a98e9bbd2e am 5694cd00: (-s ours) am 61ddf10d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '5694cd0058b73b3458ccf76e3e42757cb0b15412':
  Import translations. DO NOT MERGE
2012-08-16 15:05:18 -07:00
Baligh Uddin
5694cd0058 am 61ddf10d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '61ddf10d63faa686fa0155c002f97732013390df':
  Import translations. DO NOT MERGE
2012-08-16 15:03:08 -07:00
Baligh Uddin
61ddf10d63 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-16 15:01:28 -07:00
Baligh Uddin
6b6355b9bc Merge "Import translations. DO NOT MERGE" 2012-08-16 14:50:40 -07:00
Baligh Uddin
a4d0f7e313 Import translations. DO NOT MERGE
Change-Id: Ic4de59a722517410ba99820d0484708f42c52711
Auto-generated-cl: translation import
2012-08-16 14:49:51 -07:00
Baligh Uddin
77fd1d9431 Import translations. DO NOT MERGE
Change-Id: Ia37da41da85a756cb59799c52efadf5289eeacf3
Auto-generated-cl: translation import
2012-08-16 14:46:47 -07:00
Dianne Hackborn
88303fe5aa am 2de17ff4: am bb06a427: Rename UserId to UserHandle.
* commit '2de17ff49a6bb11148f085eba6bc37aee834345b':
  Rename UserId to UserHandle.
2012-08-16 12:53:47 -07:00
Dianne Hackborn
2de17ff49a am bb06a427: Rename UserId to UserHandle.
* commit 'bb06a427eb471227cf42a8078a54ca0581309493':
  Rename UserId to UserHandle.
2012-08-16 12:51:41 -07:00
Dianne Hackborn
bb06a427eb Rename UserId to UserHandle.
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
2012-08-16 12:47:09 -07:00