88290 Commits

Author SHA1 Message Date
Baligh Uddin
5e7f72e354 Import translations. DO NOT MERGE
Change-Id: I8b0d4f8146956bb0569ec01ef0872ad0a7065f0c
Auto-generated-cl: translation import
2012-09-26 17:08:16 -07:00
Fabrice Di Meglio
d28c3643a6 am 21289957: am fea9df63: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
* commit '21289957a91213c922236deb6010dbde1d652c5e':
  Fix bug #6427629 Clean up layout direction APIs
2012-09-26 13:58:11 -07:00
Fabrice Di Meglio
21289957a9 am fea9df63: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
* commit 'fea9df6386d66089b004719f194625e159bb344a':
  Fix bug #6427629 Clean up layout direction APIs
2012-09-26 13:56:23 -07:00
Fabrice Di Meglio
fea9df6386 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-26 13:54:16 -07:00
Ashish Sharma
e8ac0e68d1 am b39f3f46: am 8b3750e2: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
* commit 'b39f3f4696bf473d986ecc45461754beec931174':
  Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
2012-09-26 13:53:01 -07:00
Ashish Sharma
b39f3f4696 am 8b3750e2: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
* commit '8b3750e2ce6a4627df751eb239b7b75d390149cc':
  Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
2012-09-26 13:51:09 -07:00
Ashish Sharma
8b3750e2ce Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev 2012-09-26 13:49:29 -07:00
Romain Guy
1c8cd46a09 am 83b6c24e: am 54ea6bf2: Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev
* commit '83b6c24e612a0bf625c24502a3c0b7617a85af50':
  Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
2012-09-26 13:47:48 -07:00
Romain Guy
83b6c24e61 am 54ea6bf2: Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev
* commit '54ea6bf2aa5e8d72c96f410d87ec96431abe641c':
  Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
2012-09-26 13:46:01 -07:00
Ashish Sharma
404479a98c Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
Bug: 7189605
Change-Id: Id54b8d490d7849bf071c3fbfd8f7358ed873a4e8
2012-09-26 13:45:18 -07:00
Romain Guy
54ea6bf2aa Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev 2012-09-26 13:44:03 -07:00
Jeff Sharkey
2ecc9592e5 am a98137c1: am 1951db86: Merge "Multi-user ringtone playback." into jb-mr1-dev
* commit 'a98137c16d433ebc14e64c363e8c2fe86c74c2a7':
  Multi-user ringtone playback.
2012-09-26 13:42:39 -07:00
Jeff Sharkey
a98137c16d am 1951db86: Merge "Multi-user ringtone playback." into jb-mr1-dev
* commit '1951db86f527ff4e8c2ddf4306779ce956cd372d':
  Multi-user ringtone playback.
2012-09-26 13:40:53 -07:00
Jeff Sharkey
1951db86f5 Merge "Multi-user ringtone playback." into jb-mr1-dev 2012-09-26 13:38:22 -07:00
Romain Guy
bd43152bda Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR
Bug #7221173

Change-Id: I231a47187792c93af9e3b9321fd1e25bc2f20117
2012-09-26 13:36:47 -07:00
Joe Malin
6214c9c0c2 am aaa2ebdc: am fd3398c8: am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit 'aaa2ebdccec0d37a990ae45d831847f9253b8a65':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:52:29 -07:00
Joe Malin
aaa2ebdcce am fd3398c8: am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit 'fd3398c8bf25d8ec7ce813ebda431d67d734f268':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:50:17 -07:00
Joe Malin
fd3398c8bf am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit '44c564f251653286f3d2b8608ff5fccba39e831f':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:48:58 -07:00
Joe Malin
44c564f251 am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit 'd8104d9b3debad8c960a302972488e5157702618':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:45:58 -07:00
Joe Malin
d8104d9b3d am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit '829986a5f6b46a744f1f9953b8af5bbe849c71a9':
  DOC CHANGE: Fix Google Play services page
2012-09-26 12:43:38 -07:00
Joe Malin
829986a5f6 Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 2012-09-26 12:41:43 -07:00
Joe Malin
74708d896b DOC CHANGE: Fix Google Play services page
Change-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b
2012-09-26 12:36:50 -07:00
Dirk Dougherty
0e2bb7b9a9 am 17a5745b: am 832981c2: am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
* commit '17a5745bc99d25977013588a71a4c2a45138199c':
  Doc change: Update GP services description.
2012-09-26 12:09:43 -07:00
Dirk Dougherty
17a5745bc9 am 832981c2: am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
* commit '832981c2135317d26bfaf2dc40acff30135542c3':
  Doc change: Update GP services description.
2012-09-26 12:06:49 -07:00
Dirk Dougherty
832981c213 am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
* commit '6aba1d7bb9935c42ef8dd53ce81cb45184a39e45':
  Doc change: Update GP services description.
2012-09-26 12:04:50 -07:00
Dirk Dougherty
6aba1d7bb9 am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
* commit '8a58c030e3a56878cac6f449161c8b29d9557006':
  Doc change: Update GP services description.
2012-09-26 12:02:47 -07:00
Xia Wang
3d3eac7bee am 68c37742: am b4510e3c: Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev
* commit '68c37742cfdff42b9df4fbd6bbe3d75a0381ce56':
  Fix Wifi Stress test after wifi settings are moved to Settings.global
2012-09-26 12:02:44 -07:00
Xia Wang
68c37742cf am b4510e3c: Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev
* commit 'b4510e3c6dc645753533cd3b2e17e99de41480b4':
  Fix Wifi Stress test after wifi settings are moved to Settings.global
2012-09-26 12:00:58 -07:00
Dirk Dougherty
8a58c030e3 am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
* commit '8e3dca8d274270d8cb43d0df10787c7409bcc8cc':
  Doc change: Update GP services description.
2012-09-26 12:00:54 -07:00
Xia Wang
b4510e3c6d Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev 2012-09-26 11:58:59 -07:00
Dirk Dougherty
8e3dca8d27 Merge "Doc change: Update GP services description." into jb-dev-docs 2012-09-26 11:58:30 -07:00
Scott Main
47a39892a4 am 56d86e53: am 4368ba45: am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '56d86e53b539fd892cb30e5d59078b7dc45a51a8':
  add analog clock attributes to docs
2012-09-26 11:54:29 -07:00
Dirk Dougherty
d2a8a5ecf9 Doc change: Update GP services description.
Change-Id: I9891c3bd900726d0c7fb39ac91157e6e58c52ed8
2012-09-26 11:54:18 -07:00
Scott Main
56d86e53b5 am 4368ba45: am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '4368ba45adebf17d7962ad551363ac302cb2b1c7':
  add analog clock attributes to docs
2012-09-26 11:51:43 -07:00
Xavier Ducrohet
2ac6b296a7 am 7d4f070e: (-s ours) am a2b978bc: Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev
* commit '7d4f070e18eadae0c056f6929dbf524a1aea1b84':
  Fix writing text version of styleable IDs. do not merge.
2012-09-26 11:50:18 -07:00
Scott Main
4368ba45ad am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '3cda846725c31b49f6c60ba986ccc7b2eb1adab3':
  add analog clock attributes to docs
2012-09-26 11:49:48 -07:00
Scott Main
3cda846725 am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc':
  add analog clock attributes to docs
2012-09-26 11:47:38 -07:00
Xavier Ducrohet
7d4f070e18 am a2b978bc: Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev
* commit 'a2b978bc55d5ebd8c32c41a707b5a155216ee0a5':
  Fix writing text version of styleable IDs. do not merge.
2012-09-26 11:47:24 -07:00
Scott Main
8bf95ee635 am ed5ff3bd: add analog clock attributes to docs
* commit 'ed5ff3bdb015b0dc391a566d6f61ba7a533b3843':
  add analog clock attributes to docs
2012-09-26 11:45:21 -07:00
Xavier Ducrohet
a2b978bc55 Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev 2012-09-26 11:45:09 -07:00
Scott Main
72ce2c1763 am 991a5f38: am 80c491f0: am 16eb5366: am 54645245: am 14a36625: fix markup bugs
* commit '991a5f3856b3f714d81141e7413558e5fbe8109a':
  fix markup bugs
2012-09-26 11:44:50 -07:00
Scott Main
ed5ff3bdb0 add analog clock attributes to docs
Change-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b
2012-09-26 11:42:09 -07:00
Scott Main
991a5f3856 am 80c491f0: am 16eb5366: am 54645245: am 14a36625: fix markup bugs
* commit '80c491f07ac9f6453309fcaa601e904ae80a172e':
  fix markup bugs
2012-09-26 11:41:43 -07:00
Scott Main
80c491f07a am 16eb5366: am 54645245: am 14a36625: fix markup bugs
* commit '16eb53668bc000c9d6cdd9c2dd68e51f16483d25':
  fix markup bugs
2012-09-26 11:39:54 -07:00
Scott Main
16eb53668b am 54645245: am 14a36625: fix markup bugs
* commit '5464524524ce40af3e421e2d1c9bf810605ae43a':
  fix markup bugs
2012-09-26 11:37:38 -07:00
Scott Main
5464524524 am 14a36625: fix markup bugs
* commit '14a366255aee79eec81d5a80ec3d8f298af9a938':
  fix markup bugs
2012-09-26 11:34:49 -07:00
Romain Guy
8a9a095295 am 81f9c799: am 2ea1045a: Merge "Applies a layer\'s color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev
* commit '81f9c799241cea72214d1cdd0f139ef9ae80db66':
  Applies a layer's color filter even when the layer is a quad Bug #7238059
2012-09-26 11:29:17 -07:00
Romain Guy
81f9c79924 am 2ea1045a: Merge "Applies a layer\'s color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev
* commit '2ea1045a0148cac45f873fc6324682044d599f73':
  Applies a layer's color filter even when the layer is a quad Bug #7238059
2012-09-26 11:27:09 -07:00
Romain Guy
2ea1045a01 Merge "Applies a layer's color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev 2012-09-26 11:25:04 -07:00
Romain Guy
e529ece37f Applies a layer's color filter even when the layer is a quad
Bug #7238059

Change-Id: Ib4736a419bc1a9a67a01d090516ed049fe3aebca
2012-09-26 11:23:17 -07:00