kmccormick
38070994f8
am 962088fd: am 10d598a2: am ac1807ab: am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit '962088fd4985c82c189432a36cef1ffd7df4f65c':
Doc update: obsolete ant target.
2013-03-29 14:43:35 -07:00
kmccormick
962088fd49
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.
2013-03-29 14:40:57 -07:00
kmccormick
10d598a2bd
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.
2013-03-29 14:38:19 -07:00
Kenny Root
eda7cb0ce8
am 9759a476: am b3817722: Merge "KeyStore: add API to query storage type" into jb-mr2-dev
...
* commit '9759a47650cfd8624f49eb1f152fd900921f3d6e':
KeyStore: add API to query storage type
2013-03-29 14:36:33 -07:00
kmccormick
9766476211
am cd186198: 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 'cd18619857c958f9d8120591918cf0eea33c08a3':
Doc update: typos in code snippets.
2013-03-29 14:36:24 -07:00
kmccormick
5dee53588a
am bea4797d: am da58f7f1: am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit 'bea4797dd2451047dac857f849aa22d0588853ad':
Doc update: emulator bug fix
2013-03-29 14:36:18 -07:00
Jatin Lodhia
278700fdb9
am 98c762bf: am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev
...
* commit '98c762bf7cd291e4ae3d9923a8feb3389855ecff':
AccountManager changes for profile seeding.
2013-03-29 14:36:14 -07:00
Romain Guy
addf0e96c4
am 254f8082: am 77ebbbe0: Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687 " into jb-mr2-dev
...
* commit '254f80823f034da878c66eda32c604e0333cc318':
Prevent crash when a single layer is enqueued several times for updates Bug #8504687
2013-03-29 14:36:09 -07:00
Fabrice Di Meglio
01da3f416c
am 3526196d: am 3dc52ce7: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
...
* commit '3526196d1f405d6a42c15d3091ca3843c2002422':
Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-03-29 14:36:00 -07:00
kmccormick
ac1807ab1d
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.
2013-03-29 14:35:34 -07:00
Irfan Sheriff
d236406ed7
am 2b2845b0: am 964a6a7e: Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev
...
* commit '2b2845b0c130a495e844ec454cb61f9d0f76899e':
Scope certs for wifi UID and handle migration
2013-03-29 14:35:14 -07:00
Raph Levien
172c406529
am 2adf34e3: am 76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev
...
* commit '2adf34e3899ee6f74b053ca5bb0dda291c7f2014':
Switch indic fonts to Noto
2013-03-29 14:34:49 -07:00
Raph Levien
85973db79d
am 0a914107: am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev
...
* commit '0a914107205981a8baa079736c959ea9abedbf50':
Make zero width space a line breaker
2013-03-29 14:34:46 -07:00
Dianne Hackborn
c3aac10360
am d680287b: am cb5a4bf2: Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev
...
* commit 'd680287b420dea41280a28d80eac79f780e0f7d0':
Apparently SystemUI no longer needs the carousel.
2013-03-29 14:34:38 -07:00
kmccormick
acf47ca633
am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'da03abb635009e555fc00783084ce17d548fe08d':
Doc update: obsolete ant target.
2013-03-29 14:31:24 -07:00
Jean-Michel Trivi
7678a7beea
resolved conflicts for merge of 99bd302c to master
...
Change-Id: I858f67d0c61f6403b336c82a300f69027fc16bd1
2013-03-29 14:30:34 -07:00
kmccormick
da03abb635
am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'addfe2bef1c84296188bf426e52e01bc62d49b9a':
Doc update: obsolete ant target.
2013-03-29 14:28:30 -07:00
Kenny Root
9759a47650
am b3817722: Merge "KeyStore: add API to query storage type" into jb-mr2-dev
...
* commit 'b381772246e305de3839728d9688190753800462':
KeyStore: add API to query storage type
2013-03-29 14:28:18 -07:00
kmccormick
addfe2bef1
am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'd51a557ab662c868d2d28675234de8eaf1c675e6':
Doc update: obsolete ant target.
2013-03-29 14:25:44 -07:00
Kenny Root
b381772246
Merge "KeyStore: add API to query storage type" into jb-mr2-dev
2013-03-29 21:24:35 +00:00
kmccormick
d51a557ab6
Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
2013-03-29 21:23:02 +00:00
kmccormick
cd18619857
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.
2013-03-29 14:21:18 -07:00
Kenny Root
5cb5cec6a4
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
2013-03-29 14:21:10 -07:00
kmccormick
0525c09bc0
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.
2013-03-29 14:18:12 -07:00
kmccormick
138ad7ba1b
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.
2013-03-29 14:15:43 -07:00
kmccormick
36b8beec20
Doc update: obsolete ant target.
...
"Bug: 8435577"
Change-Id: Iaec80cef09f70ccc5d0421b4d2d9a16ada0bd12d
2013-03-29 14:15:10 -07:00
kmccormick
a80a71648a
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.
2013-03-29 14:12:44 -07:00
kmccormick
859a4301d8
am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '4e259b2cde9cc028fbaddcd650934b6d422e0dff':
Doc update: typos in code snippets.
2013-03-29 14:10:16 -07:00
kmccormick
4e259b2cde
am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '0e6691be2abbc11af2d50f1dfdebf3f11285993d':
Doc update: typos in code snippets.
2013-03-29 14:07:54 -07:00
kmccormick
0e6691be2a
Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
2013-03-29 21:05:00 +00:00
kmccormick
741b2f20a1
Doc update: typos in code snippets.
...
"Bug: 8475026"
Change-Id: If516a2a6c6416f1fb10c0d4f0c94bd5e849e0cc9
2013-03-29 14:03:20 -07:00
kmccormick
bea4797dd2
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
2013-03-29 13:58:57 -07:00
kmccormick
da58f7f1c3
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
2013-03-29 13:57:22 -07:00
kmccormick
d80f58095b
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
2013-03-29 13:56:05 -07:00
kmccormick
7c805a0e0e
am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit '404eb8d36a2e6ebea3f16ad1e013423f7f1d4d13':
Doc update: emulator bug fix
2013-03-29 13:54:15 -07:00
kmccormick
404eb8d36a
am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit 'a243e162542cd4dcfc3ffd7b46b111efe402972f':
Doc update: emulator bug fix
2013-03-29 13:51:07 -07:00
kmccormick
a243e16254
am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit '82a42a25e3e7dceefdca41096ce6e768f285076c':
Doc update: emulator bug fix
2013-03-29 13:49:31 -07:00
Jatin Lodhia
98c762bf7c
am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev
...
* commit 'ce66fd747928fd1af119bcdc120bfcfb5add05b1':
AccountManager changes for profile seeding.
2013-03-29 13:47:38 -07:00
kmccormick
82a42a25e3
Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
2013-03-29 20:47:11 +00:00
kmccormick
84cb2be8ea
Doc update: emulator bug fix
...
"Bug: 7990692"
Change-Id: I767c5662cebf7fe8f578190bc9730d72e97abeb1
2013-03-29 13:45:03 -07:00
Jatin Lodhia
ce66fd7479
Merge "AccountManager changes for profile seeding." into jb-mr2-dev
2013-03-29 20:44:49 +00:00
Romain Guy
254f80823f
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
2013-03-29 13:32:14 -07:00
Romain Guy
77ebbbe042
Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687 " into jb-mr2-dev
2013-03-29 20:29:11 +00:00
Fabrice Di Meglio
3526196d1f
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
2013-03-29 12:42:05 -07:00
Fabrice Di Meglio
3dc52ce711
Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
2013-03-29 19:38:50 +00:00
Romain Guy
02b49b70ed
Prevent crash when a single layer is enqueued several times for updates
...
Bug #8504687
Change-Id: I9b01bbc4e3f37af23dfe5e68d3d03ad3d238b94a
2013-03-29 12:37:16 -07:00
Irfan Sheriff
2b2845b0c1
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
2013-03-29 10:36:38 -07:00
Irfan Sheriff
964a6a7e20
Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev
2013-03-29 17:32:44 +00:00
Raph Levien
2adf34e389
am 76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev
...
* commit '76a407442e0567e6c658cab546c32efc92711dc0':
Switch indic fonts to Noto
2013-03-29 10:06:04 -07:00
Raph Levien
0a91410720
am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev
...
* commit '8fed6bc894a993a195ebcb8e8772b725cd828f0d':
Make zero width space a line breaker
2013-03-29 10:02:16 -07:00
