kmccormick
5652935aef
am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit '5a5ff0b807f456055a7eadb46bca7f674585529d':
Doc update: fix broken XML causing prob in View
2013-03-28 17:25:18 -07:00
kmccormick
5a5ff0b807
am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit '6754e05b4e034a5118d669a547708c7adebd3202':
Doc update: fix broken XML causing prob in View
2013-03-28 17:23:03 -07:00
kmccormick
6754e05b4e
am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit 'c1fbc91b78b0cb9ff6c6398846d984afc2fd541f':
Doc update: fix broken XML causing prob in View
2013-03-28 17:20:48 -07:00
kmccormick
c1fbc91b78
am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit 'a42ddee1c2fad01521812ffde5968b9e92487caa':
Doc update: fix broken XML causing prob in View
2013-03-28 17:18:12 -07:00
kmccormick
a42ddee1c2
Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
2013-03-29 00:16:21 +00:00
kmccormick
ac7122d984
Doc update: fix broken XML causing prob in View
...
"Bug: 5873694"
Change-Id: I2b2a822538886825f8a863c741f2aebb665883f8
2013-03-28 17:04:00 -07:00
Kenny Root
e89ebc767e
am ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"
...
* commit 'ce7f2723ad42f09fb173a9b86d3546e1474fd667':
AndroidKeyStore: add Builder for param spec
2013-03-28 16:52:52 -07:00
Geremy Condra
24948d3ca7
am 946a5c91: Merge "Save off the seinfo value with packages.list."
...
* commit '946a5c91d95daea8e12c235f003abbd3191b57b2':
Save off the seinfo value with packages.list.
2013-03-28 16:52:49 -07:00
kmccormick
0de7af1e18
am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
...
* commit 'c9c63003b2e30c068a1bc9eba7683b75ca272180':
Doc update: misc fixes
2013-03-28 16:45:16 -07:00
kmccormick
c9c63003b2
am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
...
* commit 'fd245a2ed78fd2b39c6d09ad0b1d84c275544c33':
Doc update: misc fixes
2013-03-28 16:43:26 -07:00
kmccormick
fd245a2ed7
am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
...
* commit '593c0dbf255dd5b3766372ac26eb9b3da1957852':
Doc update: misc fixes
2013-03-28 16:42:09 -07:00
kmccormick
593c0dbf25
am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
...
* commit '378d43677b45ec8dc629bc18f360d35f13c9ffec':
Doc update: misc fixes
2013-03-28 16:39:53 -07:00
kmccormick
378d43677b
Merge "Doc update: misc fixes" into jb-mr1.1-docs
2013-03-28 23:36:45 +00:00
kmccormick
50e27c8135
Doc update: misc fixes
...
"Bug: 3424410"
Some of these had already been fixed.
Change-Id: I1d0ab3a8fa51aa308186059db4186e7a7d24e9f8
2013-03-28 16:33:46 -07:00
kmccormick
a25c43f554
am 3121868c: am 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum
...
* commit '3121868cb860eb47182fcbae5d55667af51afb5a':
Doc update: fix incorrect enum
2013-03-28 16:24:25 -07:00
kmccormick
3121868cb8
am 38e94e9f: am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum
...
* commit '38e94e9f820ffd9eeda8ccb92ee77183cc870dde':
Doc update: fix incorrect enum
2013-03-28 16:22:29 -07:00
kmccormick
38e94e9f82
am 4d0beb7e: am 4f414b79: Doc update: fix incorrect enum
...
* commit '4d0beb7e54ed37cf9e854b793983046478233fdf':
Doc update: fix incorrect enum
2013-03-28 16:19:37 -07:00
kmccormick
4d0beb7e54
am 4f414b79: Doc update: fix incorrect enum
...
* commit '4f414b7949a969c1e1cb0597155bca1d3aa2c455':
Doc update: fix incorrect enum
2013-03-28 16:17:23 -07:00
kmccormick
4f414b7949
Doc update: fix incorrect enum
...
"Bug: 4980236"
Change-Id: I39f8f429574a9916c5fffc5b2e4ec4715ec48803
2013-03-28 16:14:08 -07:00
Kenny Root
ce7f2723ad
Merge "AndroidKeyStore: add Builder for param spec"
2013-03-28 23:13:28 +00:00
Kenny Root
acb0b5b220
AndroidKeyStore: add Builder for param spec
...
Change-Id: I13403197e1ac7ac607efa10979eb73bde0135a2a
2013-03-28 16:05:46 -07:00
kmccormick
5c3ddcd14b
am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
...
* commit '425c3d5f59f1e315cdbdd5f7530c4380aabf76ab':
Doc update: superceeded > superseded
2013-03-28 15:27:54 -07:00
kmccormick
425c3d5f59
am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
...
* commit '99049335a604cae3f515fce32bc5f1b27fe8d29b':
Doc update: superceeded > superseded
2013-03-28 15:26:25 -07:00
kmccormick
99049335a6
am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
...
* commit '3ed65cb3496afe90d82bfadbff4d2687189ae47d':
Doc update: superceeded > superseded
2013-03-28 15:24:39 -07:00
kmccormick
3ed65cb349
am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
...
* commit '689e827aa3fa69d20087972dfb93ed257e4d109b':
Doc update: superceeded > superseded
2013-03-28 15:23:08 -07:00
kmccormick
689e827aa3
Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
2013-03-28 22:21:12 +00:00
kmccormick
ac66b85a04
Doc update: superceeded > superseded
...
"Bug: 5935672"
Change-Id: Ie2324d00d454cf3f3f3ed422dea2017b8a7a4c54
2013-03-28 15:19:06 -07:00
Geremy Condra
946a5c91d9
Merge "Save off the seinfo value with packages.list."
2013-03-28 21:45:22 +00:00
Kenny Root
d4b8baf3ed
am 02c86306: Merge "Add ability to install credentials as other UID"
...
* commit '02c86306d2569d18a49da3d9228dacb25b1f8973':
Add ability to install credentials as other UID
2013-03-28 14:27:13 -07:00
Elliott Hughes
3ae3048377
am a19647d3: Merge "Correct executable bit for source files [Take 2]"
...
* commit 'a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe':
Correct executable bit for source files [Take 2]
2013-03-28 14:27:09 -07:00
Geremy Condra
f21a34bf1b
am 2ff853da: Merge "Add data validation on seinfo labels."
...
* commit '2ff853daa89ca47491c3f7b096872a432d4a19e7':
Add data validation on seinfo labels.
2013-03-28 14:27:06 -07:00
Kenny Root
02c86306d2
Merge "Add ability to install credentials as other UID"
2013-03-28 20:56:58 +00:00
Elliott Hughes
a19647d3d8
Merge "Correct executable bit for source files [Take 2]"
2013-03-28 20:50:34 +00:00
Geremy Condra
2ff853daa8
Merge "Add data validation on seinfo labels."
2013-03-28 20:30:36 +00:00
Kenny Root
3e7be43e25
Add ability to install credentials as other UID
...
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.
Bug: 8183258
Change-Id: I652b7e6fa93deda6d6d310be33f224e5a356c787
2013-03-28 11:30:11 -07:00
Robert Craig
d417ab0ea5
Add data validation on seinfo labels.
...
Ensure that policy contains a clean seinfo
string. Where clean means no whitespace characters.
Change-Id: I814411cbc8d16eaed99a1389f5487529e36e617b
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-28 12:19:27 -04:00
kmccormick
9773b6e9ae
am f508cb7b: am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
...
* commit 'f508cb7bdb6a994e241711f91763ac8951311e2b':
Doc update: typo
2013-03-27 19:24:43 -07:00
kmccormick
f508cb7bdb
am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
...
* commit '571c01b494be76af9291b87c09f43a0fb30b3edb':
Doc update: typo
2013-03-27 19:22:18 -07:00
kmccormick
571c01b494
am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
...
* commit 'a8115d06afa29146edcab5f1edca83d2c7a89f2d':
Doc update: typo
2013-03-27 19:20:34 -07:00
kmccormick
a8115d06af
am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
...
* commit 'f65b5d085bc62382eba530179a24a1cf1a7d353d':
Doc update: typo
2013-03-27 19:18:43 -07:00
kmccormick
f65b5d085b
Merge "Doc update: typo" into jb-mr1.1-docs
2013-03-28 02:16:05 +00:00
kmccormick
fcc42da4d9
am 7aec7790: am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
...
* commit '7aec77901b92423b835a87be88fbbf3bc5ff0c91':
Doc update: use parse, not new
2013-03-27 19:03:12 -07:00
kmccormick
7aec77901b
am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
...
* commit '061d4a95cf924fcf113d11b2d4d001f696a65e1f':
Doc update: use parse, not new
2013-03-27 19:00:48 -07:00
kmccormick
603f987f14
am 418172bf: am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
...
* commit '418172bf8823016785526b433801d44a4630f276':
Doc change: Fix typo DONT_DELTE
2013-03-27 18:59:42 -07:00
kmccormick
061d4a95cf
am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
...
* commit '3af7b848143bef17230674bbed79ca77d3527e8e':
Doc update: use parse, not new
2013-03-27 18:59:10 -07:00
kmccormick
418172bf88
am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
...
* commit '19840a8d40139a12469ef92c3541f2a433d5ae85':
Doc change: Fix typo DONT_DELTE
2013-03-27 18:57:27 -07:00
kmccormick
3af7b84814
am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
...
* commit '821d4943702e49844629ae9b522383a21210a64f':
Doc update: use parse, not new
2013-03-27 18:57:24 -07:00
kmccormick
d55e676a59
am 7db86662: am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
...
* commit '7db866620491b3fa09dbcf2abe097bf33a73b034':
Doc Update: bug fix.
2013-03-27 18:56:08 -07:00
kmccormick
19840a8d40
am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
...
* commit '65c66c74f4db7d16ccff1a67f416f74c716b3773':
Doc change: Fix typo DONT_DELTE
2013-03-27 18:55:51 -07:00
kmccormick
7db8666204
am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
...
* commit '63dc67bd6b026d3590af980b5dfddd4e68fd7831':
Doc Update: bug fix.
2013-03-27 18:54:07 -07:00