Commit Graph

7546 Commits

Author SHA1 Message Date
Przemyslaw Szczepaniak
7edae431ee am 06649d02: am 923187a1: Keep speech rate dialog after rotate
* commit '06649d02b2d6e3f147a1082c7538682f97e64a0b':
  Keep speech rate dialog after rotate
2012-08-10 07:18:23 -07:00
Przemyslaw Szczepaniak
06649d02b2 am 923187a1: Keep speech rate dialog after rotate
* commit '923187a159cb0c192a2f978a6bf1dd51275ea916':
  Keep speech rate dialog after rotate
2012-08-10 07:17:36 -07:00
Przemyslaw Szczepaniak
923187a159 Keep speech rate dialog after rotate
It also adds some missing @Override

Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
2012-08-10 07:13:52 -07:00
Baligh Uddin
b1e833987b am 2dc3d551: (-s ours) am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2dc3d551963426df9411fbc48db9f4112014d21b':
  Import translations. DO NOT MERGE
2012-08-09 19:53:46 -07:00
Baligh Uddin
2dc3d55196 am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '658f909d711b1598ec6f49447679569f0bc19c15':
  Import translations. DO NOT MERGE
2012-08-09 19:52:40 -07:00
Baligh Uddin
658f909d71 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-09 19:50:14 -07:00
Baligh Uddin
35293e5500 Merge "Import translations. DO NOT MERGE" 2012-08-09 19:49:10 -07:00
Irfan Sheriff
79a0554444 am 6a88ef4b: am aae0659e: Setting to turn off power optimizations
* commit '6a88ef4bd233591cfdd3cfa5cee9af61483242eb':
  Setting to turn off power optimizations
2012-08-09 16:06:33 -07:00
Irfan Sheriff
6a88ef4bd2 am aae0659e: Setting to turn off power optimizations
* commit 'aae0659e18e013401b83717a83ec25393d4ba626':
  Setting to turn off power optimizations
2012-08-09 15:58:13 -07:00
Irfan Sheriff
aae0659e18 Setting to turn off power optimizations
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
2012-08-09 15:16:07 -07:00
Baligh Uddin
f2ccce3633 Import translations. DO NOT MERGE
Change-Id: I5e16b50a8efca5da984acc9ad76d3bed76ee8d83
Auto-generated-cl: translation import
2012-08-09 12:42:04 -07:00
Baligh Uddin
0ad6982813 Import translations. DO NOT MERGE
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
2012-08-09 12:39:18 -07:00
John Spurlock
fc470e4db7 am aeb7b571: am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
* commit 'aeb7b5710593b982d2306eb2006b6ae153655141':
  Fix NPE in Dreams settings.
2012-08-09 06:22:56 -07:00
John Spurlock
aeb7b57105 am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
* commit 'eaffad37c19ac5859539c232a7dc8d2f47159f61':
  Fix NPE in Dreams settings.
2012-08-09 06:20:50 -07:00
John Spurlock
eaffad37c1 Merge "Fix NPE in Dreams settings." into jb-mr1-dev 2012-08-09 06:18:45 -07:00
John Spurlock
7a99b21a4b Fix NPE in Dreams settings.
Handle the null case to avoid crashing Settings.

Change-Id: I257b766370bd604e0af5b332241619258fb732c9
2012-08-09 09:03:48 -04:00
Baligh Uddin
1178969da3 am 8aa63452: (-s ours) am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8aa634529cfeda5d375a2a541038b8b7976f8a85':
  Import translations. DO NOT MERGE
2012-08-08 20:05:51 -07:00
Baligh Uddin
8aa634529c am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '702cdf4c9a84fd9bcb258cdb26c57fd8d50961d6':
  Import translations. DO NOT MERGE
2012-08-08 20:04:24 -07:00
Baligh Uddin
702cdf4c9a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-08 20:02:24 -07:00
Baligh Uddin
d2983fd132 Merge "Import translations. DO NOT MERGE" 2012-08-08 20:01:24 -07:00
Jean-Baptiste Queru
9b46e9a231 am 17d915b7: am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '17d915b7fdc4527710022ed3dd6c48bc03b8157b':
  Add support for SE Android to the Settings app.
2012-08-08 15:11:26 -07:00
Jean-Baptiste Queru
17d915b7fd am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '66321184570da9e93c089b2a1065fc3d4c7230a3':
  Add support for SE Android to the Settings app.
2012-08-08 14:09:11 -07:00
Jean-Baptiste Queru
6632118457 am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '7526636406087666d005d389ddc0cdacd79499fd':
  Add support for SE Android to the Settings app.
2012-08-08 14:06:31 -07:00
Jean-Baptiste Queru
7526636406 am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.
2012-08-08 14:04:11 -07:00
Baligh Uddin
b20162733a Import translations. DO NOT MERGE
Change-Id: I036bc0a27767d78ad6cb86b255db7af28e9040d6
Auto-generated-cl: translation import
2012-08-08 13:44:29 -07:00
Baligh Uddin
24fb893381 Import translations. DO NOT MERGE
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
2012-08-08 13:40:29 -07:00
Jean-Baptiste Queru
5d72b27267 Merge "Add support for SE Android to the Settings app." 2012-08-08 13:19:26 -07:00
The Android Open Source Project
77ea82f697 am a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'a01ab9e5763b16e89239f40a56edfee5f0c8fa75':
2012-08-08 08:21:52 -07:00
The Android Open Source Project
a01ab9e576 Reconcile with jb-mr1-release - do not merge
Change-Id: I6809fcad464f90b62407ba5e19da9a226ca3be83
2012-08-08 08:18:04 -07:00
The Android Automerger
3f793b5654 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-08 06:47:58 -07:00
Matthew Xie
4b6c57c74b am 83457dd7: am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
* commit '83457dd79bb481afe9a1ad16259802b0a09fe68a':
  Remove Profile Auto connection specific logic
2012-08-08 00:37:48 -07:00
Matthew Xie
83457dd79b am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
* commit 'a1f463cb1930e806420844d4915def2dcfe7ae72':
  Remove Profile Auto connection specific logic
2012-08-08 00:35:29 -07:00
Matthew Xie
a1f463cb19 Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 2012-08-08 00:33:38 -07:00
Baligh Uddin
e7522c808f Merge "Import translations. DO NOT MERGE" 2012-08-07 16:12:21 -07:00
The Android Open Source Project
227a1f66e7 am 422446e1: (-s ours) am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '422446e1ef8d42501a72800f81037ff142119f62':
2012-08-07 15:22:53 -07:00
Baligh Uddin
13568ef880 am eb2de9e8: (-s ours) am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'eb2de9e879489bc62adca6ea19c54836b77b7a6d':
  Import translations. DO NOT MERGE
2012-08-07 15:22:43 -07:00
The Android Open Source Project
422446e1ef am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '4325cf22ef3d381bc9d28d264571ba305da94d57':
2012-08-07 15:16:20 -07:00
The Android Open Source Project
4325cf22ef am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '7e107a0903707876c0ad7dd4ee2702fd5baed7ae':
2012-08-07 15:14:14 -07:00
The Android Open Source Project
7e107a0903 Reconcile with jb-mr0-release - do not merge
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
2012-08-07 14:59:46 -07:00
Baligh Uddin
eb2de9e879 am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '6ac8bae6a927c918391224277ff3c1524e7565a4':
  Import translations. DO NOT MERGE
2012-08-07 14:55:55 -07:00
Baligh Uddin
6ac8bae6a9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-07 14:54:02 -07:00
Baligh Uddin
502e4e2b50 Import translations. DO NOT MERGE
Change-Id: I0aae3c990b8f8b72ef3e8c2cbb6719bf7b05135e
Auto-generated-cl: translation import
2012-08-07 14:27:38 -07:00
Baligh Uddin
7eac4706a8 Import translations. DO NOT MERGE
Change-Id: I9d1d42585e5e2f0299a2a761089bb7984ca55531
Auto-generated-cl: translation import
2012-08-07 14:24:33 -07:00
The Android Automerger
9a85ed20ee merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:34 -07:00
Dianne Hackborn
4f7a133f36 am eb657dc8: am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev
* commit 'eb657dc8eb8f6bb990b8dd974dd92844106f2572':
  Add dev setting to enable global actions bug report button.
2012-08-07 11:52:56 -07:00
Dianne Hackborn
eb657dc8eb am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev
* commit 'f621435eafcb46f69b35b8a6b8119ab87801e9ef':
  Add dev setting to enable global actions bug report button.
2012-08-07 11:51:11 -07:00
Dianne Hackborn
f621435eaf Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev 2012-08-07 11:49:15 -07:00
Dianne Hackborn
2d803a3931 Add dev setting to enable global actions bug report button.
Change-Id: I3768f95e1c6fbec9c10186093e5e1d48b0ef6ae4
2012-08-07 11:26:32 -07:00
The Android Open Source Project
ab1db58b5d am 5acc9098: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '5acc909860388a8863e3ec9d38a290fd418cce22':
2012-08-07 11:08:26 -07:00
The Android Open Source Project
5acc909860 Reconcile with jb-mr1-release - do not merge
Change-Id: Ie33aa8887f43fe794d289a745451db6fa73a9c20
2012-08-07 11:04:56 -07:00