OSDN Git Service
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: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:51:01 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
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: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: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: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: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
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
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: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
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
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: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.
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
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 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
kmccormick [Fri, 29 Mar 2013 21:46:53 +0000 (14:46 -0700)]
am
d2c1e947: am
39f864b1: am
5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '
d2c1e947ea27ccea8060b0ef4509b3d6c90c4c51':
Doc update: incorrect method name
kmccormick [Fri, 29 Mar 2013 21:44:59 +0000 (14:44 -0700)]
am
39f864b1: am
5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '
39f864b18153768224f4e1b6a650dfa0a9312055':
Doc update: incorrect method name
kmccormick [Fri, 29 Mar 2013 21:42:44 +0000 (14:42 -0700)]
am
5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '
5018688b69129a6d1c58167329df1b06dba23095':
Doc update: incorrect method name
kmccormick [Fri, 29 Mar 2013 21:40:57 +0000 (14:40 -0700)]
am
10d598a2: am
ac1807ab: am
acf47ca6: am
da03abb6: am
addfe2be: am
d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
* commit '
10d598a2bd1ed7d2a46c06ec5acfab233003634b':
Doc update: obsolete ant target.
kmccormick [Fri, 29 Mar 2013 21:38:49 +0000 (21:38 +0000)]
Merge "Doc update: incorrect method name" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 21:38:19 +0000 (14:38 -0700)]
am
ac1807ab: am
acf47ca6: am
da03abb6: am
addfe2be: am
d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
* commit '
ac1807ab1d90a531550ee07356c52fe05abae32d':
Doc update: obsolete ant target.
kmccormick [Fri, 29 Mar 2013 21:35:34 +0000 (14:35 -0700)]
am
acf47ca6: am
da03abb6: am
addfe2be: am
d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
* commit '
acf47ca6331f6e9576e9970ec8b657e068cc02cb':
Doc update: obsolete ant target.
kmccormick [Fri, 29 Mar 2013 21:31:54 +0000 (14:31 -0700)]
Doc update: incorrect method name
"Bug:
8177983"
Change-Id: Ib8f811a8e82dbff9b4e97cb670dec66342a0df00
kmccormick [Fri, 29 Mar 2013 21:31:24 +0000 (14:31 -0700)]
am
da03abb6: am
addfe2be: am
d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
* commit '
da03abb635009e555fc00783084ce17d548fe08d':
Doc update: obsolete ant target.
kmccormick [Fri, 29 Mar 2013 21:28:30 +0000 (14:28 -0700)]
am
addfe2be: am
d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
* commit '
addfe2bef1c84296188bf426e52e01bc62d49b9a':
Doc update: obsolete ant target.
Kenny Root [Fri, 29 Mar 2013 21:28:18 +0000 (14:28 -0700)]
am
b3817722: Merge "KeyStore: add API to query storage type" into jb-mr2-dev
* commit '
b381772246e305de3839728d9688190753800462':
KeyStore: add API to query storage type
kmccormick [Fri, 29 Mar 2013 21:25:44 +0000 (14:25 -0700)]
am
d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
* commit '
d51a557ab662c868d2d28675234de8eaf1c675e6':
Doc update: obsolete ant target.
Kenny Root [Fri, 29 Mar 2013 21:24:35 +0000 (21:24 +0000)]
Merge "KeyStore: add API to query storage type" into jb-mr2-dev
kmccormick [Fri, 29 Mar 2013 21:23:02 +0000 (21:23 +0000)]
Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 21:21:18 +0000 (14:21 -0700)]
am
0525c09b: am
138ad7ba: am
a80a7164: am
859a4301: am
4e259b2c: am
0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
* commit '
0525c09bc07a7b45a132f13769e830466547d0d9':
Doc update: typos in code snippets.
Kenny Root [Fri, 29 Mar 2013 18:14:17 +0000 (11:14 -0700)]
KeyStore: add API to query storage type
Add an API to keystore daemon to query what kind of storage is currently
in use.
(cherry picked from commit
a738e2a1aee26e0be3944c11820724aeca313f83)
Change-Id: I52c84449a27b1cefc49372a6406b7132c2bbddee
kmccormick [Fri, 29 Mar 2013 21:18:12 +0000 (14:18 -0700)]
am
138ad7ba: am
a80a7164: am
859a4301: am
4e259b2c: am
0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
* commit '
138ad7ba1b59f6105d1f79966e616f5970970ef3':
Doc update: typos in code snippets.
kmccormick [Fri, 29 Mar 2013 21:15:43 +0000 (14:15 -0700)]
am
a80a7164: am
859a4301: am
4e259b2c: am
0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
* commit '
a80a71648ac9cb306007e67afbc4bedb4debf899':
Doc update: typos in code snippets.
kmccormick [Fri, 29 Mar 2013 21:14:44 +0000 (14:14 -0700)]
Doc update: obsolete ant target.
"Bug:
8435577"
Change-Id: Iaec80cef09f70ccc5d0421b4d2d9a16ada0bd12d
kmccormick [Fri, 29 Mar 2013 21:12:44 +0000 (14:12 -0700)]
am
859a4301: am
4e259b2c: am
0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
* commit '
859a4301d83bf894ffd79e4f3d8abf82ce1143c5':
Doc update: typos in code snippets.
kmccormick [Fri, 29 Mar 2013 21:10:16 +0000 (14:10 -0700)]
am
4e259b2c: am
0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
* commit '
4e259b2cde9cc028fbaddcd650934b6d422e0dff':
Doc update: typos in code snippets.
Kenny Root [Fri, 29 Mar 2013 21:09:24 +0000 (21:09 +0000)]
Merge "KeyStore: add API to query storage type"
kmccormick [Fri, 29 Mar 2013 21:07:54 +0000 (14:07 -0700)]
am
0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
* commit '
0e6691be2abbc11af2d50f1dfdebf3f11285993d':
Doc update: typos in code snippets.
Michael Wright [Fri, 29 Mar 2013 00:27:50 +0000 (17:27 -0700)]
Finish any event in the current input queue
When the pipelining optimization was added we never updated
handleImeFinishedEvent to look through the whole queue of items, so it was only
looking at the head.
Bug:
8498214
Change-Id: I79c62392a93b47e3e1eab3f4fe54a5c999dfb566
kmccormick [Fri, 29 Mar 2013 21:05:00 +0000 (21:05 +0000)]
Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 21:02:54 +0000 (14:02 -0700)]
Doc update: typos in code snippets.
"Bug:
8475026"
Change-Id: If516a2a6c6416f1fb10c0d4f0c94bd5e849e0cc9
kmccormick [Fri, 29 Mar 2013 20:58:57 +0000 (13:58 -0700)]
am
da58f7f1: am
d80f5809: am
7c805a0e: am
404eb8d3: am
a243e162: am
82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
* commit '
da58f7f1c396c71fa89d58bc2c25e6ed30cb573f':
Doc update: emulator bug fix
kmccormick [Fri, 29 Mar 2013 20:57:22 +0000 (13:57 -0700)]
am
d80f5809: am
7c805a0e: am
404eb8d3: am
a243e162: am
82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
* commit '
d80f58095b5b1358c40c9bdf50afceaaa7ce87e5':
Doc update: emulator bug fix
kmccormick [Fri, 29 Mar 2013 20:56:05 +0000 (13:56 -0700)]
am
7c805a0e: am
404eb8d3: am
a243e162: am
82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
* commit '
7c805a0e0eb42244438c83678f103c4bb7071a4b':
Doc update: emulator bug fix
kmccormick [Fri, 29 Mar 2013 20:54:15 +0000 (13:54 -0700)]
am
404eb8d3: am
a243e162: am
82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
* commit '
404eb8d36a2e6ebea3f16ad1e013423f7f1d4d13':
Doc update: emulator bug fix
kmccormick [Fri, 29 Mar 2013 20:51:07 +0000 (13:51 -0700)]
am
a243e162: am
82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
* commit '
a243e162542cd4dcfc3ffd7b46b111efe402972f':
Doc update: emulator bug fix
kmccormick [Fri, 29 Mar 2013 20:49:31 +0000 (13:49 -0700)]
am
82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
* commit '
82a42a25e3e7dceefdca41096ce6e768f285076c':
Doc update: emulator bug fix
Jatin Lodhia [Fri, 29 Mar 2013 20:47:38 +0000 (13:47 -0700)]
am
ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev
* commit '
ce66fd747928fd1af119bcdc120bfcfb5add05b1':
AccountManager changes for profile seeding.
kmccormick [Fri, 29 Mar 2013 20:47:11 +0000 (20:47 +0000)]
Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
kmccormick [Fri, 29 Mar 2013 20:44:19 +0000 (13:44 -0700)]
Doc update: emulator bug fix
"Bug:
7990692"
Change-Id: I767c5662cebf7fe8f578190bc9730d72e97abeb1
Jatin Lodhia [Fri, 29 Mar 2013 20:44:49 +0000 (20:44 +0000)]
Merge "AccountManager changes for profile seeding." into jb-mr2-dev
Romain Guy [Fri, 29 Mar 2013 20:32:14 +0000 (13:32 -0700)]
am
77ebbbe0: Merge "Prevent crash when a single layer is enqueued several times for updates Bug #
8504687" into jb-mr2-dev
* commit '
77ebbbe042dc4d5c162da5e2d3b379ebc8514fc9':
Prevent crash when a single layer is enqueued several times for updates Bug #
8504687
Romain Guy [Fri, 29 Mar 2013 20:29:11 +0000 (20:29 +0000)]
Merge "Prevent crash when a single layer is enqueued several times for updates Bug #
8504687" into jb-mr2-dev
Fabrice Di Meglio [Wed, 27 Mar 2013 23:36:21 +0000 (16:36 -0700)]
Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
- use private flag bit field for ViewGroup.MarginLayoutParams
- make ViewDebug support "byte" type for FlagMapping
Change-Id: Iff7c31544e3ce2d29919c9424425f2bf87042b8b
Fabrice Di Meglio [Fri, 29 Mar 2013 19:42:05 +0000 (12:42 -0700)]
am
3dc52ce7: Merge "Fix bug #
8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
* commit '
3dc52ce711a6345d9f18dd31e39344792116597c':
Fix bug #
8505156 WiFi properties dialog is having some issues in RTL mode
Fabrice Di Meglio [Fri, 29 Mar 2013 19:38:50 +0000 (19:38 +0000)]
Merge "Fix bug #
8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
Romain Guy [Fri, 29 Mar 2013 19:37:16 +0000 (12:37 -0700)]
Prevent crash when a single layer is enqueued several times for updates
Bug #
8504687
Change-Id: I9b01bbc4e3f37af23dfe5e68d3d03ad3d238b94a
Kenny Root [Fri, 29 Mar 2013 18:14:17 +0000 (11:14 -0700)]
KeyStore: add API to query storage type
Add an API to keystore daemon to query what kind of storage is currently
in use.
Change-Id: I5a83ae92250ca63b691dcf1beb8b3e1703797745
Irfan Sheriff [Fri, 29 Mar 2013 17:36:38 +0000 (10:36 -0700)]
am
964a6a7e: Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev
* commit '
964a6a7e209b0db262c827721ae5fde3f98ca763':
Scope certs for wifi UID and handle migration
Irfan Sheriff [Fri, 29 Mar 2013 17:32:44 +0000 (17:32 +0000)]
Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev
Raph Levien [Fri, 29 Mar 2013 17:06:04 +0000 (10:06 -0700)]
am
76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev
* commit '
76a407442e0567e6c658cab546c32efc92711dc0':
Switch indic fonts to Noto
OSDN Git Service
