OSDN Git Service
Tim Murray [Mon, 1 Apr 2013 20:32:29 +0000 (13:32 -0700)]
am
28c2246f: am
4134ce33: Merge "Fix blur intrinsic creation." into jb-mr2-dev
* commit '
28c2246f0baf4357f1205202089a6c949d62aa79':
Fix blur intrinsic creation.
Tim Murray [Mon, 1 Apr 2013 20:29:57 +0000 (13:29 -0700)]
am
4134ce33: Merge "Fix blur intrinsic creation." into jb-mr2-dev
* commit '
4134ce3386e791bd2e024677197e36a3b4768dbb':
Fix blur intrinsic creation.
Tim Murray [Mon, 1 Apr 2013 20:27:28 +0000 (20:27 +0000)]
Merge "Fix blur intrinsic creation." into jb-mr2-dev
Tim Murray [Mon, 1 Apr 2013 18:35:35 +0000 (11:35 -0700)]
Fix blur intrinsic creation.
Change-Id: Iaf54c7395d447eec94d8b6c12986fa8d16c030f5
Scott Main [Mon, 1 Apr 2013 18:46:31 +0000 (11:46 -0700)]
am
246aed27: am
53de5c29: am
f1ba1fb4: am
bfe4a29b: am
1e8d22cc: am
37a10754: am
2ab25723: update IO announcement on homepage for IO Extended
* commit '
246aed27d30f3ee205cca43ceadee718b0c9b072':
update IO announcement on homepage for IO Extended
Scott Main [Mon, 1 Apr 2013 18:45:08 +0000 (11:45 -0700)]
am
53de5c29: am
f1ba1fb4: am
bfe4a29b: am
1e8d22cc: am
37a10754: am
2ab25723: update IO announcement on homepage for IO Extended
* commit '
53de5c296a579e9012d152f8a25c08f6f6091b3b':
update IO announcement on homepage for IO Extended
Scott Main [Mon, 1 Apr 2013 18:42:33 +0000 (11:42 -0700)]
am
f1ba1fb4: am
bfe4a29b: am
1e8d22cc: am
37a10754: am
2ab25723: update IO announcement on homepage for IO Extended
* commit '
f1ba1fb4ba55d4d706716b74060cbcc04bb48bfc':
update IO announcement on homepage for IO Extended
Scott Main [Mon, 1 Apr 2013 18:40:02 +0000 (11:40 -0700)]
am
bfe4a29b: am
1e8d22cc: am
37a10754: am
2ab25723: update IO announcement on homepage for IO Extended
* commit '
bfe4a29bd63bfed7662341d58882f9e3813c3264':
update IO announcement on homepage for IO Extended
Scott Main [Mon, 1 Apr 2013 18:37:24 +0000 (11:37 -0700)]
am
1e8d22cc: am
37a10754: am
2ab25723: update IO announcement on homepage for IO Extended
* commit '
1e8d22ccede109b4c8e80a6af2ed494fc77cb850':
update IO announcement on homepage for IO Extended
Scott Main [Mon, 1 Apr 2013 18:36:01 +0000 (11:36 -0700)]
am
37a10754: am
2ab25723: update IO announcement on homepage for IO Extended
* commit '
37a10754dea09ab9018446c9f667eb5d7d58758c':
update IO announcement on homepage for IO Extended
Scott Main [Mon, 1 Apr 2013 18:33:02 +0000 (11:33 -0700)]
am
2ab25723: update IO announcement on homepage for IO Extended
* commit '
2ab257231fe774748298ab92f78564a5e19f23f0':
update IO announcement on homepage for IO Extended
Jean-Baptiste Queru [Mon, 1 Apr 2013 18:31:20 +0000 (11:31 -0700)]
am
82f070e6: am
b7aca350: Merge "It helps to catch the right exception."
* commit '
82f070e67a6635c8d85253da0f5f1b48effa1d02':
It helps to catch the right exception.
Jean-Baptiste Queru [Mon, 1 Apr 2013 18:28:59 +0000 (11:28 -0700)]
am
b7aca350: Merge "It helps to catch the right exception."
* commit '
b7aca350e4c46bbc431f2ecaa4d8cee87915fe8b':
It helps to catch the right exception.
Mike Lockwood [Mon, 1 Apr 2013 18:27:43 +0000 (11:27 -0700)]
am
b1a2b594: am
1341f1ee: MTP: Implement date created field in GetObjectInfo
* commit '
b1a2b59493ccc80d40e0422e2a86132bdc2de932':
MTP: Implement date created field in GetObjectInfo
Mike Lockwood [Mon, 1 Apr 2013 18:25:06 +0000 (11:25 -0700)]
am
1341f1ee: MTP: Implement date created field in GetObjectInfo
* commit '
1341f1eee3493fc5e263494acb8adebb6f0180b6':
MTP: Implement date created field in GetObjectInfo
Scott Main [Mon, 1 Apr 2013 17:59:43 +0000 (10:59 -0700)]
update IO announcement on homepage for IO Extended
Change-Id: Id0e769162236954670dee07d6ac225a9d4b83581
Mike Lockwood [Mon, 1 Apr 2013 17:52:47 +0000 (10:52 -0700)]
MTP: Implement date created field in GetObjectInfo
Bug:
8293874
Change-Id: I3e50ea1049f63e2ed3a1f849fef74a2fbf206fe8
Jean-Baptiste Queru [Mon, 1 Apr 2013 17:26:19 +0000 (17:26 +0000)]
Merge "It helps to catch the right exception."
Raph Levien [Mon, 1 Apr 2013 17:11:40 +0000 (10:11 -0700)]
am
fa4b63b3: am
0102443c: Merge "Rename DroidNaskh UI font" into jb-mr2-dev
* commit '
fa4b63b3e54e840ce3cb11fa6a740f5632f7f07f':
Rename DroidNaskh UI font
Raph Levien [Mon, 1 Apr 2013 17:10:15 +0000 (10:10 -0700)]
am
0102443c: Merge "Rename DroidNaskh UI font" into jb-mr2-dev
* commit '
0102443c4f52f2e15fd731c452f0c4745312d448':
Rename DroidNaskh UI font
Raph Levien [Mon, 1 Apr 2013 17:07:31 +0000 (17:07 +0000)]
Merge "Rename DroidNaskh UI font" into jb-mr2-dev
Craig Mautner [Mon, 1 Apr 2013 16:11:05 +0000 (16:11 +0000)]
Merge "Move mStacks to ActivityStackSupervisor"
Amith Yamasani [Mon, 1 Apr 2013 00:55:27 +0000 (17:55 -0700)]
am
30cfaf7c: am
63fba8c1: Merge "Add new primary accounts to secondary limited users" into jb-mr2-dev
* commit '
30cfaf7c863cf33dbfa6c7f9681997735fe62d40':
Add new primary accounts to secondary limited users
Amith Yamasani [Mon, 1 Apr 2013 00:53:26 +0000 (17:53 -0700)]
am
63fba8c1: Merge "Add new primary accounts to secondary limited users" into jb-mr2-dev
* commit '
63fba8c12e3cf3e1fba39d9b76e230e25f98953c':
Add new primary accounts to secondary limited users
Amith Yamasani [Mon, 1 Apr 2013 00:50:00 +0000 (00:50 +0000)]
Merge "Add new primary accounts to secondary limited users" into jb-mr2-dev
Amith Yamasani [Mon, 1 Apr 2013 00:44:31 +0000 (17:44 -0700)]
Add new primary accounts to secondary limited users
When a new account is added to the primary, those will be marked
as shared accounts for secondary limited users. If the secondary user
is currently running, clone the account right away.
Bug:
8510431
Change-Id: Ie8ad87a7205e7b1a5a1752e75fbbfc416b2a58a7
Baligh Uddin [Sun, 31 Mar 2013 02:58:12 +0000 (19:58 -0700)]
am
5cf353a8: (-s ours) am
d087c4ee: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
5cf353a899a68721547316cc21ae83e2dc2f0b4e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 31 Mar 2013 02:55:11 +0000 (19:55 -0700)]
am
d087c4ee: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
d087c4ee5bc3a8c22a24ab573589c7c29380b6d9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 31 Mar 2013 02:52:35 +0000 (02:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Sun, 31 Mar 2013 02:51:01 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Amith Yamasani [Sun, 31 Mar 2013 02:30:57 +0000 (19:30 -0700)]
am
5abd3b39: am
9fd0854d: Merge "Fix test" into jb-mr2-dev
* commit '
5abd3b39bf980c4dfae877cef3e0b68bd86ee43d':
Fix test
Amith Yamasani [Sun, 31 Mar 2013 02:20:18 +0000 (19:20 -0700)]
resolved conflicts for merge of
15935aad to master
Change-Id: I9664186a62cf7b11844c6a14967f5b8c2b67c289
Amith Yamasani [Sun, 31 Mar 2013 02:05:17 +0000 (19:05 -0700)]
am
9fd0854d: Merge "Fix test" into jb-mr2-dev
* commit '
9fd0854d2a875667b3662aff39d65831b5298cdf':
Fix test
Amith Yamasani [Sun, 31 Mar 2013 02:01:21 +0000 (02:01 +0000)]
Merge "Fix test" into jb-mr2-dev
Amith Yamasani [Sun, 31 Mar 2013 02:00:30 +0000 (19:00 -0700)]
Fix test
Change-Id: I329ceff03d3707e10c2e4eabfb8e6ea61082ae6d
Amith Yamasani [Sun, 31 Mar 2013 01:34:57 +0000 (18:34 -0700)]
am
42bc734b: Merge "Block access to accounts for limited users." into jb-mr2-dev
* commit '
42bc734b302f1fe68c031e013513535bed4c24f1':
Block access to accounts for limited users.
Amith Yamasani [Sun, 31 Mar 2013 01:32:39 +0000 (01:32 +0000)]
Merge "Block access to accounts for limited users." into jb-mr2-dev
Amith Yamasani [Sun, 31 Mar 2013 00:07:47 +0000 (17:07 -0700)]
Block access to accounts for limited users.
Make sure that apps that have access to restricted accounts can see them.
If they don't have access, they shouldn't be able to add a new account either.
Show an error message in the account picker if the user/app is not authorized.
Change-Id: I117c0b14d7d06c5ac4e66506df156b174567f5f3
Geremy Condra [Sat, 30 Mar 2013 22:13:40 +0000 (15:13 -0700)]
am
1ad4ce69: am
cac0e0b1: Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev
* commit '
1ad4ce693fb0b9e83a8e84ae25631ab77b8685a3':
Add SELinux updater and Settings-based enforcement switch.
Geremy Condra [Sat, 30 Mar 2013 22:11:18 +0000 (15:11 -0700)]
am
cac0e0b1: Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev
* commit '
cac0e0b11ba3f9f73ddb0ab18e136d61f700c356':
Add SELinux updater and Settings-based enforcement switch.
Geremy Condra [Sat, 30 Mar 2013 22:08:19 +0000 (22:08 +0000)]
Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev
Jean-Michel Trivi [Sat, 30 Mar 2013 19:46:33 +0000 (12:46 -0700)]
am
3af2d3f1: am
6f268369: Fix RemoteControlStackEntry constructor in AudioService
* commit '
3af2d3f1dec6c5b5c7d5a3bca994b4d36c62fdd8':
Fix RemoteControlStackEntry constructor in AudioService
Jean-Michel Trivi [Sat, 30 Mar 2013 19:44:17 +0000 (12:44 -0700)]
am
6f268369: Fix RemoteControlStackEntry constructor in AudioService
* commit '
6f2683698ea1b316ae49623a7e9a13d9d9b53f71':
Fix RemoteControlStackEntry constructor in AudioService
Jean-Michel Trivi [Sat, 30 Mar 2013 19:35:51 +0000 (12:35 -0700)]
Fix RemoteControlStackEntry constructor in AudioService
Add missing call to constructor of RccPlaybackState to initialize
the mPlaybackState field of the RemoteControlStackEntry class.
bug
8512601
Change-Id: I636d5c1b416d6a3d3808d5be53c9c544ab293732
Amith Yamasani [Sat, 30 Mar 2013 01:52:58 +0000 (18:52 -0700)]
am
5c98b904: am
9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev
* commit '
5c98b9046506cc69b261dd6ac2ae39b2de0afacb':
Improve RestrictionEntry API
Amith Yamasani [Sat, 30 Mar 2013 01:51:14 +0000 (18:51 -0700)]
am
9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev
* commit '
9e8ba8f27316c793578e68fcc6632a6ea6240f4a':
Improve RestrictionEntry API
Amith Yamasani [Sat, 30 Mar 2013 01:47:33 +0000 (01:47 +0000)]
Merge "Improve RestrictionEntry API" into jb-mr2-dev
Fabrice Di Meglio [Sat, 30 Mar 2013 01:02:42 +0000 (18:02 -0700)]
am
68951ee9: am
83390182: Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev
* commit '
68951ee958e72319facc267289ca363622758e0a':
Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
Fabrice Di Meglio [Sat, 30 Mar 2013 01:01:07 +0000 (18:01 -0700)]
am
83390182: Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev
* commit '
83390182bfe50a3611d78b57ab2f3a8558ede2aa':
Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
Fabrice Di Meglio [Sat, 30 Mar 2013 00:58:50 +0000 (00:58 +0000)]
Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev
Elliott Hughes [Sat, 30 Mar 2013 00:58:44 +0000 (17:58 -0700)]
am
1e61ea82: am
55e9d98d: Merge "Clarify the documentation of SparseArray.indexOfValue."
* commit '
1e61ea82f423f4149fc19868fc0eca42fbb5d986':
Clarify the documentation of SparseArray.indexOfValue.
Baligh Uddin [Sat, 30 Mar 2013 00:43:16 +0000 (17:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibeb6301010d40c15feef19cb7b8b90f6a9502034
Auto-generated-cl: translation import
Baligh Uddin [Sat, 30 Mar 2013 00:34:35 +0000 (17:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf70f5a7b5c553d0b7d96caa6e4a9dc2057a97fa
Auto-generated-cl: translation import
Amith Yamasani [Thu, 28 Mar 2013 21:33:16 +0000 (14:33 -0700)]
Improve RestrictionEntry API
More getters and setters, better naming.
New extra defined for returning a custom intent that handles showing the
restrictions UI.
Change-Id: I2ee0cdb4edd99e71a9004ff5e929dbe243b45557
Elliott Hughes [Sat, 30 Mar 2013 00:13:44 +0000 (17:13 -0700)]
am
55e9d98d: Merge "Clarify the documentation of SparseArray.indexOfValue."
* commit '
55e9d98d990f7a015d4c10f5e5a92ae131637073':
Clarify the documentation of SparseArray.indexOfValue.
Geremy Condra [Wed, 27 Mar 2013 04:09:01 +0000 (21:09 -0700)]
Add SELinux updater and Settings-based enforcement switch.
Bug:
8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
Geremy Condra [Fri, 29 Mar 2013 23:40:58 +0000 (23:40 +0000)]
Merge "Fix a comment to fix the build."
Geremy Condra [Fri, 29 Mar 2013 23:39:45 +0000 (16:39 -0700)]
Fix a comment to fix the build.
Change-Id: I9acfef97572bbb0438afbc95df6a718ba506c2c4
Elliott Hughes [Fri, 29 Mar 2013 23:25:07 +0000 (23:25 +0000)]
Merge "Clarify the documentation of SparseArray.indexOfValue."
kmccormick [Fri, 29 Mar 2013 23:23:53 +0000 (16:23 -0700)]
am
160c0059: am
257719ec: am
cccf6e9b: am
9f0ed0ee: am
58db9597: am
e4ca0650: am
31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
* commit '
160c0059f1499dbb7fdba7306f32227af7a15baa':
Doc update: clarify dumpsys instructions
kmccormick [Fri, 29 Mar 2013 23:21:11 +0000 (16:21 -0700)]
am
257719ec: am
cccf6e9b: am
9f0ed0ee: am
58db9597: am
e4ca0650: am
31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
* commit '
257719ec2a6f1949a08900b4b5cc625f1f8d8c26':
Doc update: clarify dumpsys instructions
kmccormick [Fri, 29 Mar 2013 23:18:40 +0000 (16:18 -0700)]
am
cccf6e9b: am
9f0ed0ee: am
58db9597: am
e4ca0650: am
31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
* commit '
cccf6e9b85e7f9e5f404137dde5dbd9db937592b':
Doc update: clarify dumpsys instructions
Geremy Condra [Fri, 29 Mar 2013 23:18:19 +0000 (23:18 +0000)]
Merge "Add SELinux updater and Settings-based enforcement switch."
Geremy Condra [Fri, 29 Mar 2013 23:17:03 +0000 (23:17 +0000)]
Merge "Add ConfigUpdater settings values to the global table."
kmccormick [Fri, 29 Mar 2013 23:16:10 +0000 (16:16 -0700)]
am
9f0ed0ee: am
58db9597: am
e4ca0650: am
31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
* commit '
9f0ed0ee508b8f2233c8834f067e2fb8275d2cfa':
Doc update: clarify dumpsys instructions
Raph Levien [Fri, 29 Mar 2013 23:13:36 +0000 (16:13 -0700)]
Rename DroidNaskh UI font
Renames DroidNaskh-Regular-SystemUI to DroidNaskhUI-Regular to be
consistent with naming scheme for Noto fonts.
Change-Id: I3319ee5cd85360c85b0523bd932d461eb05d1b18
kmccormick [Fri, 29 Mar 2013 23:13:12 +0000 (16:13 -0700)]
am
58db9597: am
e4ca0650: am
31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
* commit '
58db95970c9ba47dd83e06cc165d2dc5cc29ce8a':
Doc update: clarify dumpsys instructions
kmccormick [Fri, 29 Mar 2013 23:11:48 +0000 (16:11 -0700)]
am
e4ca0650: am
31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
* commit '
e4ca0650eaad85ce5700ff99940c0acefed210bc':
Doc update: clarify dumpsys instructions
kmccormick [Fri, 29 Mar 2013 23:09:58 +0000 (16:09 -0700)]
am
cb937f23: am
be1339ed: am
328f7b71: am
90fa2ae2: am
23b55e78: am
3fab60bd: am
183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '
cb937f23fd35db726cc239e9c6156d2a86919793':
Doc update: PlaybackCompleted valid state 4 pause
kmccormick [Fri, 29 Mar 2013 23:09:54 +0000 (16:09 -0700)]
am
5614e462: am
a92ca7fa: am
a8858d21: am
93c4446a: am
75fa3012: am
18f76d62: am
a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '
5614e4625d57722300eaafd215f41ddfb9107546':
Doc update: clarify guidelines for firewall setup.
Kenny Root [Fri, 29 Mar 2013 23:09:52 +0000 (16:09 -0700)]
am
7d164f66: am
557ec556: Merge "KeyStore: add API to query storage type"
* commit '
7d164f660da5ac18739a4781f3f6d4acb6e671b5':
KeyStore: add API to query storage type
kmccormick [Fri, 29 Mar 2013 23:09:26 +0000 (16:09 -0700)]
am
31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
* commit '
31ed1722b1e66211e7cbf55c2e9d55c1ce66b171':
Doc update: clarify dumpsys instructions
kmccormick [Fri, 29 Mar 2013 23:06:58 +0000 (23:06 +0000)]
Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 23:06:42 +0000 (16:06 -0700)]
am
be1339ed: am
328f7b71: am
90fa2ae2: am
23b55e78: am
3fab60bd: am
183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '
be1339edc445eef19c3aa880b51a5c500cab6f82':
Doc update: PlaybackCompleted valid state 4 pause
kmccormick [Fri, 29 Mar 2013 23:06:39 +0000 (16:06 -0700)]
am
a92ca7fa: am
a8858d21: am
93c4446a: am
75fa3012: am
18f76d62: am
a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '
a92ca7fa3ec630aee14e51d87851749956bad875':
Doc update: clarify guidelines for firewall setup.
Michael Wright [Fri, 29 Mar 2013 23:06:12 +0000 (16:06 -0700)]
am
b09b5d42: am
ee5880c9: Merge "Finish any event in the current input queue" into jb-mr2-dev
* commit '
b09b5d42ec07a050f1b27d59684393af96cd8704':
Finish any event in the current input queue
Kenny Root [Fri, 29 Mar 2013 23:04:51 +0000 (16:04 -0700)]
am
557ec556: Merge "KeyStore: add API to query storage type"
* commit '
557ec55641d73db126db0c8e94ec70409814a7c1':
KeyStore: add API to query storage type
kmccormick [Fri, 29 Mar 2013 23:04:09 +0000 (16:04 -0700)]
am
328f7b71: am
90fa2ae2: am
23b55e78: am
3fab60bd: am
183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '
328f7b7160d4c5a30c6810cbcd4aa01bb7b57dda':
Doc update: PlaybackCompleted valid state 4 pause
kmccormick [Fri, 29 Mar 2013 23:04:05 +0000 (16:04 -0700)]
am
a8858d21: am
93c4446a: am
75fa3012: am
18f76d62: am
a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '
a8858d215123b819557d130bfeeeb50568649b51':
Doc update: clarify guidelines for firewall setup.
Michael Wright [Fri, 29 Mar 2013 23:03:01 +0000 (16:03 -0700)]
am
ee5880c9: Merge "Finish any event in the current input queue" into jb-mr2-dev
* commit '
ee5880c95a6f6528a2497e1cc9580880aa1c95ef':
Finish any event in the current input queue
kmccormick [Fri, 29 Mar 2013 23:02:30 +0000 (16:02 -0700)]
am
90fa2ae2: am
23b55e78: am
3fab60bd: am
183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '
90fa2ae28c200e0269f86f7d4e486ce781763a99':
Doc update: PlaybackCompleted valid state 4 pause
kmccormick [Fri, 29 Mar 2013 23:02:27 +0000 (16:02 -0700)]
am
93c4446a: am
75fa3012: am
18f76d62: am
a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '
93c4446af02b3ccf6da5f8bd7ecb4b8b1cdf62d5':
Doc update: clarify guidelines for firewall setup.
kmccormick [Fri, 29 Mar 2013 23:00:50 +0000 (16:00 -0700)]
Doc update: clarify dumpsys instructions
"Bug:
8474578"
Change-Id: Ic743de8f41a1b2d38a4d2495148dc07e2f45b8e5
kmccormick [Fri, 29 Mar 2013 23:00:06 +0000 (16:00 -0700)]
am
23b55e78: am
3fab60bd: am
183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '
23b55e78c86b09e806790d4f3ee47646216a9b87':
Doc update: PlaybackCompleted valid state 4 pause
kmccormick [Fri, 29 Mar 2013 23:00:03 +0000 (16:00 -0700)]
am
75fa3012: am
18f76d62: am
a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '
75fa3012467117933d6afb7353b1c027bd446b72':
Doc update: clarify guidelines for firewall setup.
Michael Wright [Fri, 29 Mar 2013 22:58:50 +0000 (22:58 +0000)]
Merge "Finish any event in the current input queue" into jb-mr2-dev
kmccormick [Fri, 29 Mar 2013 22:57:32 +0000 (15:57 -0700)]
am
3fab60bd: am
183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '
3fab60bddb4ae719185f884ad167e5f16eaa4314':
Doc update: PlaybackCompleted valid state 4 pause
kmccormick [Fri, 29 Mar 2013 22:57:30 +0000 (15:57 -0700)]
am
18f76d62: am
a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '
18f76d621e001f6b717ac2519f374887fa620891':
Doc update: clarify guidelines for firewall setup.
kmccormick [Fri, 29 Mar 2013 22:55:49 +0000 (15:55 -0700)]
am
183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '
183c95e0c725d3f2f213d56cf98c24cf51dc848a':
Doc update: PlaybackCompleted valid state 4 pause
kmccormick [Fri, 29 Mar 2013 22:55:47 +0000 (15:55 -0700)]
am
a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
* commit '
a353a9f83e654f1b10ceab98ef03a7607737de70':
Doc update: clarify guidelines for firewall setup.
kmccormick [Fri, 29 Mar 2013 22:53:03 +0000 (22:53 +0000)]
Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 22:48:45 +0000 (15:48 -0700)]
Doc update: PlaybackCompleted valid state 4 pause
"Bug:
7962402"
Change-Id: Ie41d7085373794e98208d8815010b3ca1d81378c
Geremy Condra [Wed, 27 Mar 2013 04:09:01 +0000 (21:09 -0700)]
Add SELinux updater and Settings-based enforcement switch.
Bug:
8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
Geremy Condra [Wed, 27 Mar 2013 04:49:26 +0000 (21:49 -0700)]
Add ConfigUpdater settings values to the global table.
This is a partial fix to a bug caused by not properly migrating
these values from secure: to global:
Change-Id: Iaed77b5ab671f9cd229c7883ae09a0b4a5f3c64e
kmccormick [Fri, 29 Mar 2013 22:44:48 +0000 (22:44 +0000)]
Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 22:21:12 +0000 (15:21 -0700)]
Doc update: clarify guidelines for firewall setup.
Change-Id: Id3284bb21a0a2b612babf6cf582fda8f1c73cb80
kmccormick [Fri, 29 Mar 2013 22:02:40 +0000 (15:02 -0700)]
am
306a5d0f: am
da160ec3: am
6eebd6e6: am
6f50c846: am
d2c1e947: am
39f864b1: am
5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '
306a5d0fe7654653dd97a630ef8eac1fff71d78b':
Doc update: incorrect method name
kmccormick [Fri, 29 Mar 2013 21:58:50 +0000 (14:58 -0700)]
am
da160ec3: am
6eebd6e6: am
6f50c846: am
d2c1e947: am
39f864b1: am
5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '
da160ec313d844b09818a91463631440a1b8a09c':
Doc update: incorrect method name
kmccormick [Fri, 29 Mar 2013 21:51:25 +0000 (14:51 -0700)]
am
6eebd6e6: am
6f50c846: am
d2c1e947: am
39f864b1: am
5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '
6eebd6e6b44d7688489c430cad933e971530e43d':
Doc update: incorrect method name
kmccormick [Fri, 29 Mar 2013 21:48:35 +0000 (14:48 -0700)]
am
6f50c846: am
d2c1e947: am
39f864b1: am
5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '
6f50c846ad46dfeadf8eac389102031662ad892f':
Doc update: incorrect method name
OSDN Git Service
