Narayan Kamath
1810927a9b
am eabc93db: am c4c08803: Merge "app_process: change app_process a symlink of primary version"
...
* commit 'eabc93db1020be4b71f0db7d5b5d3a7991f3c264':
app_process: change app_process a symlink of primary version
2014-05-15 09:45:33 +00:00
Narayan Kamath
eabc93db10
am c4c08803: Merge "app_process: change app_process a symlink of primary version"
...
* commit 'c4c08803a8cc090aa27720e97df342231e8433af':
app_process: change app_process a symlink of primary version
2014-05-15 09:41:40 +00:00
Narayan Kamath
c4c08803a8
Merge "app_process: change app_process a symlink of primary version"
2014-05-15 09:36:28 +00:00
Ricardo Cervera
d850be5d14
am 7c05fd85: am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
...
* commit '7c05fd850bfbbbe9139a958102494260b5e6dea2':
docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:57:12 +00:00
Mathieu Chartier
760f0994db
am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"
...
* commit 'c0f18b9d0cce0c140b1274055faabff732f1e27c':
Add property for background GC type
2014-05-14 23:56:13 +00:00
Ian Rogers
76ee05d4f6
am d05c7d26: am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
...
* commit 'd05c7d265170ca6573bbdd97f3c4aaa8e25a6389':
Move FLATTENED_PATTERN to inner class.
2014-05-14 23:56:06 +00:00
Ricardo Cervera
7c05fd850b
am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
...
* commit '59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:53:20 +00:00
Mathieu Chartier
c0f18b9d0c
am c4c77d63: Merge "Add property for background GC type"
...
* commit 'c4c77d63d889baca2abbdce6326077f0911b279e':
Add property for background GC type
2014-05-14 23:52:02 +00:00
Ian Rogers
d05c7d2651
am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
...
* commit 'bcf76242134317a2f722eab5af2600fe2858f895':
Move FLATTENED_PATTERN to inner class.
2014-05-14 23:51:59 +00:00
Ricardo Cervera
59ab011eeb
am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
...
* commit '0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:49:24 +00:00
Mathieu Chartier
c4c77d63d8
Merge "Add property for background GC type"
2014-05-14 23:07:39 +00:00
Mathieu Chartier
c01936a686
Add property for background GC type
...
To disable background compaction do:
adb shell setprop dalvik.vm.backgroundgctype CMS
To enable:
adb shell setprop dalvik.vm.backgroundgctype SS
Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
2014-05-14 15:45:48 -07:00
Ricardo Cervera
0e286ab1f0
Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
2014-05-14 22:44:57 +00:00
Ian Rogers
bcf7624213
Merge "Move FLATTENED_PATTERN to inner class."
2014-05-14 22:40:58 +00:00
Ian Rogers
5d5d14fd97
Move FLATTENED_PATTERN to inner class.
...
Avoid AOT compilation/initialization in ART failing due to regex.Pattern
requiring native support.
Bug: 14646037
Change-Id: I9d9c7fd9ed9fab7e21d37f9b31c00d037fc5a691
2014-05-14 15:29:46 -07:00
Dirk Dougherty
ae4388f794
am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '0f5822847ae3422d939a7959f6a25178fcc12232':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:24:29 +00:00
Dirk Dougherty
93ccd1a2eb
am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
...
* commit '0540bc373c84b4ab590708cc9f79c95eeac5114c':
Doc change: Updated content for distribute.
2014-05-14 21:24:24 +00:00
Dirk Dougherty
0f5822847a
am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:21:23 +00:00
Dirk Dougherty
0540bc373c
am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
...
* commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
2014-05-14 21:21:15 +00:00
Dirk Dougherty
980a285b4c
am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:17:27 +00:00
Dirk Dougherty
a4e6c7d1d4
am 3506ac87: Doc change: Updated content for distribute.
...
* commit '3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
2014-05-14 21:17:22 +00:00
Dirk Dougherty
5eb99943d5
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
2014-05-14 21:16:31 +00:00
Dirk Dougherty
3506ac87c0
Doc change: Updated content for distribute.
...
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
2014-05-14 14:10:51 -07:00
Yongqin Liu
559484ed6a
app_process: change app_process a symlink of primary version
...
Change app_process to be a symlink to the primary version
and have app_process32/app_process64 be the 32-bit/64-bit
versions respectively.
This will make it possible to use the primary zygote for
am/pm commands and other scripts that use app_process and
don't need a specific zygote.
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibef545994eb95ddc82101c95df613ad1d06345e6
2014-05-14 18:48:42 +01:00
Torne (Richard Coles)
41ecc8b1e0
am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
...
* commit 'dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
Avoid supported ABI list containing "unknown".
2014-05-14 15:35:19 +00:00
Torne (Richard Coles)
dcc9cf03a8
am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
...
* commit '41ec8c9672fccce90a7156bcd856f59a36e93ad3':
Avoid supported ABI list containing "unknown".
2014-05-14 15:31:28 +00:00
Torne (Richard Coles)
41ec8c9672
Merge "Avoid supported ABI list containing "unknown"."
2014-05-14 15:26:05 +00:00
Torne (Richard Coles)
da8c037c8b
Avoid supported ABI list containing "unknown".
...
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.
Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
2014-05-14 16:17:26 +01:00
Deepanshu Gupta
406e38bd20
am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '80816bfcaf487535a45a7e6f271341eaede653b1':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:36:23 +00:00
Deepanshu Gupta
c1a7440094
am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc':
Fix build
2014-05-14 00:36:20 +00:00
Deepanshu Gupta
80816bfcaf
am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit 'f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:31:20 +00:00
Deepanshu Gupta
7dfe1fdac6
am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit 'c289ec6b465648d7d93e6f2dc9ed28822683f7d6':
Fix build
2014-05-14 00:31:15 +00:00
Deepanshu Gupta
f73dbcc378
am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '9916c17e6606607bbadacc4fb113018ecb7fcb41':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:26:43 +00:00
Deepanshu Gupta
c289ec6b46
am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '3a559d56a627687d56dc06cc459ef1e7e6b1cd79':
Fix build
2014-05-14 00:26:38 +00:00
Deepanshu Gupta
9916c17e66
am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '472cbad479b0f1361c816a2c0d5accb776fa3841':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:21:36 +00:00
Deepanshu Gupta
3a559d56a6
am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae':
Fix build
2014-05-14 00:21:33 +00:00
Deepanshu Gupta
472cbad479
am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit 'f57871f799300614d37e93e376f9381fd01c2bcb':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:15:28 +00:00
Deepanshu Gupta
b5b4756565
am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '98822f0eba746b4f8c8a622f21c2d32dad08453f':
Fix build
2014-05-14 00:15:24 +00:00
Deepanshu Gupta
f57871f799
am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '888dad0df765256f4b47268400425103106894f0':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:11:08 +00:00
Deepanshu Gupta
98822f0eba
am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '6e923e1b51c87e7b20a98dfc2fff52ca9115c9d4':
Fix build
2014-05-14 00:11:06 +00:00
Deepanshu Gupta
888dad0df7
am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit 'f33a2f62a54ef966375a7fe8706ce713386d843e':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:05:38 +00:00
Deepanshu Gupta
6e923e1b51
am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '90d57721692e45fe6259136296e3cd5b669443fc':
Fix build
2014-05-14 00:05:35 +00:00
Deepanshu Gupta
f33a2f62a5
am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit 'f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:00:08 +00:00
Deepanshu Gupta
90d5772169
am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '209745a32f0a68584aba57acf7c8d1de633b1cda':
Fix build
2014-05-14 00:00:05 +00:00
Deepanshu Gupta
f5af9a4a9a
am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '273c5c3c4c74d29a127e614726ce2e5c5e274c20':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-13 23:55:20 +00:00
Deepanshu Gupta
209745a32f
am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit 'c251147a2b6f461427b1ce49f7066fadc97c1faf':
Fix build
2014-05-13 23:55:17 +00:00
Deepanshu Gupta
273c5c3c4c
am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '9ca7a039f73e5cf84f85282cf05d637517be2a17':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-13 23:54:21 +00:00
Deepanshu Gupta
c251147a2b
am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '85ec144538de6c27b22dff1bd45491a334f626ef':
Fix build
2014-05-13 23:50:44 +00:00
Deepanshu Gupta
9ca7a039f7
resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
2014-05-13 16:48:31 -07:00
Deepanshu Gupta
85ec144538
am f266873c: am 1c55797d: Fix build
...
* commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362':
Fix build
2014-05-13 23:45:30 +00:00