Mathieu Chartier
dae9f5a515
am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."
...
* commit 'f3a2430a2b849f2c4041bcfba7fbefa9b2bb4d79':
Add dalvik.vm.gctype to enable switching between different GCs.
2013-12-03 00:05:32 +00:00
Mathieu Chartier
f3a2430a2b
am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."
...
* commit '738fa2f64e064f5c6d1003e528cde742e262312f':
Add dalvik.vm.gctype to enable switching between different GCs.
2013-12-02 16:00:49 -08:00
Mathieu Chartier
738fa2f64e
Merge "Add dalvik.vm.gctype to enable switching between different GCs."
2013-12-02 23:53:10 +00:00
Mathieu Chartier
7e4fdec6f0
Add dalvik.vm.gctype to enable switching between different GCs.
...
The option passes the specified GC type into the Xgc runtime
option.
Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.
Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
2013-12-02 15:50:18 -08:00
Scott Main
5c4c68da54
am d400e614: am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
...
* commit 'd400e6146b18b12a75d750654b8a118105fd1834':
fix FPS typo in JB highlights, reported by vharron
2013-12-02 22:29:33 +00:00
Scott Main
d400e6146b
am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
...
* commit '7511d659a2a3815cc6894cd71ebed0a27e341430':
fix FPS typo in JB highlights, reported by vharron
2013-12-02 14:25:52 -08:00
Scott Main
7511d659a2
am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
...
* commit '2dd715ed45b9000eab81b0972d0585294d7f9ddd':
fix FPS typo in JB highlights, reported by vharron
2013-12-02 22:20:22 +00:00
Scott Main
2dd715ed45
Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
2013-12-02 22:16:24 +00:00
Dirk Dougherty
ac5894d4b2
am ba6854d6: am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit 'ba6854d6f6e564d3cfad70ad0674924a1aca6cc9':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 21:57:50 +00:00
Dirk Dougherty
ba6854d6f6
am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit 'b5d5a787e31bcba8822545c56d6506a38229bf22':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 13:53:52 -08:00
Dirk Dougherty
b5d5a787e3
am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit '19d3ac5eb67bcb99f249642d41bcea89d7146104':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 21:49:31 +00:00
Dirk Dougherty
19d3ac5eb6
Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
2013-12-02 21:47:04 +00:00
Dirk Dougherty
d189845323
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
...
Change-Id: I93133f3424127a0e2da256eceee3eebc8c8add18
2013-12-02 13:40:27 -08:00
Scott Main
351001f904
fix FPS typo in JB highlights, reported by vharron
...
Change-Id: I6a98af7730d1e56f08b5ba9a9f7d462cc35e17e8
2013-12-02 12:55:33 -08:00
Scott Main
8be9d428a1
am b7cdfa02: am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit 'b7cdfa0238436d2ead785587bd50ec560bcae5bb':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 20:28:56 +00:00
Scott Main
b7cdfa0238
am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit 'b243bbb4c89e67bdbf11df47dd79645c398b877b':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 12:25:07 -08:00
Scott Main
b243bbb4c8
am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit '65907fd4af6a1074a7b052751746fd99095627c6':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 20:21:33 +00:00
Nick Kralevich
18c2736cf0
am a5a0de9f: am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
...
* commit 'a5a0de9f2943c6188bd5855adfe4c5da7a985d2d':
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
2013-12-02 20:12:55 +00:00
Scott Main
65907fd4af
dashboard update for 12/2/13
...
first appearance of kitkat
Change-Id: I528cb8d938b3a9e0da4c44db2b615ad90c211436
2013-12-02 12:11:22 -08:00
Nick Kralevich
a5a0de9f29
am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
...
* commit 'b66343049bc56d29988a91d2d29d49861a469b84':
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
2013-12-02 12:08:42 -08:00
Nick Kralevich
b66343049b
Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
2013-12-02 20:00:28 +00:00
Stephen Smalley
856df42a5a
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
...
It never worked anyhow, at least in AOSP, as nothing checks that property,
and is pointless now that enforcing mode is set by init.
Change-Id: If05dd49963c5d7081e00039b5e378032bea0939b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-02 14:38:31 -05:00
Shishir Agrawal
8b03ab8502
RIL changes for supporting generic SIM communication.
...
Adds the 4 new commands to RIL interface:
- RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
- RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
- RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
- RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)
Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
2013-12-02 10:56:21 -08:00
Geoff Mendal
6415d688e0
am 09ecd7e2: (-s ours) am d229620e: (-s ours) am 8d49b29d: (-s ours) Import translations. DO NOT MERGE
...
* commit '09ecd7e2dc9b5fba8aeae9c31bd7638732a10cfc':
Import translations. DO NOT MERGE
2013-12-02 18:50:36 +00:00
Geoff Mendal
09ecd7e2dc
am d229620e: (-s ours) am 8d49b29d: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd229620e8e9843227ade580e4e1b8913e7e18b24':
Import translations. DO NOT MERGE
2013-12-02 10:46:40 -08:00
Geoff Mendal
d229620e8e
am 8d49b29d: (-s ours) Import translations. DO NOT MERGE
...
* commit '8d49b29d81be4d7ad694fa222c48c469bd112ca3':
Import translations. DO NOT MERGE
2013-12-02 10:44:05 -08:00
Geoff Mendal
8d49b29d81
Import translations. DO NOT MERGE
...
Change-Id: Ifb196b0f76843e5488d4a387ed4f7add07e84ecd
Auto-generated-cl: translation import
2013-12-02 10:21:45 -08:00
Geoff Mendal
7f150f8676
am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE
...
* commit '4f43824b04223d3958efa757014b4c29044aae55':
Import translations. DO NOT MERGE
2013-11-27 18:35:12 +00:00
Geoff Mendal
4f43824b04
am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE
...
* commit '33c939079600ae5f7cfcd179333361819547ea49':
Import translations. DO NOT MERGE
2013-11-27 10:32:26 -08:00
Geoff Mendal
33c9390796
am 99dcfed6: (-s ours) Import translations. DO NOT MERGE
...
* commit '99dcfed6e90a3639d7d9b8cc2c1654b7cc20d573':
Import translations. DO NOT MERGE
2013-11-27 10:29:07 -08:00
Geoff Mendal
99dcfed6e9
Import translations. DO NOT MERGE
...
Change-Id: Icd558c400a77f1e2b72e7279e33c56aa96398a1e
Auto-generated-cl: translation import
2013-11-27 10:20:55 -08:00
Xavier Ducrohet
1d3205f62a
am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev
...
* commit 'b6f3708d330872232a6a57a1a5c0d2243fd7419e':
Update delegate methods in layoutlib.
2013-11-26 17:58:26 -08:00
Lorenzo Colitti
4806fdfbd0
am f226bc60: Merge "Use LinkAddress in address notifications."
...
* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248':
Use LinkAddress in address notifications.
2013-11-26 17:56:45 -08:00
Xavier Ducrohet
b6f3708d33
am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev
...
* commit '1044a1dc197a9508ef8c6b352e7983ff234b8bc4':
Update delegate methods in layoutlib.
2013-11-26 17:54:10 -08:00
Xavier Ducrohet
1044a1dc19
Merge "Update delegate methods in layoutlib." into klp-dev
2013-11-27 01:32:26 +00:00
Lorenzo Colitti
f226bc606a
Merge "Use LinkAddress in address notifications."
2013-11-27 00:52:42 +00:00
Katie McCormick
37e4c405a6
am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
...
* commit '484b57a5655f28967e0062f578f38535dff52323':
Doc updates: Javadoc fixes
2013-11-26 14:00:33 -08:00
Katie McCormick
484b57a565
am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
...
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
Doc updates: Javadoc fixes
2013-11-26 21:58:18 +00:00
Katie McCormick
9d0a88bd4e
Merge "Doc updates: Javadoc fixes" into klp-docs
2013-11-26 21:56:09 +00:00
Katie McCormick
f2ef28d840
Doc updates: Javadoc fixes
...
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
2013-11-26 13:52:48 -08:00
Jason Sams
1ccc6633bf
am 9e6d8f04: Merge "Adding operations to reflected Renderscript class"
...
* commit '9e6d8f04940fd710ae858ff7ee4df43eb03ea85e':
Adding operations to reflected Renderscript class
2013-11-26 12:32:22 -08:00
Jason Sams
9e6d8f0494
Merge "Adding operations to reflected Renderscript class"
2013-11-26 20:23:44 +00:00
Katie McCormick
ad0cab26a7
am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs
...
* commit 'fdb738a52fe0f0f3bef8b867c6646668d86835dd':
Doc update: minor changes to immersive lesson
2013-11-26 11:13:05 -08:00
Katie McCormick
fdb738a52f
am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs
...
* commit '752d8029176d3670b9e817d8465d854d4a1b933e':
Doc update: minor changes to immersive lesson
2013-11-26 19:09:52 +00:00
Katie McCormick
752d802917
Merge "Doc update: minor changes to immersive lesson" into klp-docs
2013-11-26 19:06:07 +00:00
Dan Sandler
8e77393ae9
am 99ef026f: Merge "Keep PhoneStatusBar default constructor around."
...
* commit '99ef026f48948f281467fcf4ce7ebbe15630ad45':
Keep PhoneStatusBar default constructor around.
2013-11-26 08:38:59 -08:00
Lorenzo Colitti
c1c2378033
am 9d4ac970: Merge "Pass DNS server info notifications to observers."
...
* commit '9d4ac9703657142b190d3c256de7c3329e5a4b29':
Pass DNS server info notifications to observers.
2013-11-26 08:38:48 -08:00
Lorenzo Colitti
6747ea1b1c
am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
...
* commit 'eede7e89c94b3bb56c26aec137c53d592d3bc7c3':
Minor cleanups to NetdCallbackReceiver.onEvent.
2013-11-26 08:38:45 -08:00
Lorenzo Colitti
aeefa69a88
am 8a234809: Merge "Use BaseNetworkObserver in Tethering."
...
* commit '8a234809e47106e445a4ddf2c70b9cd50d4c9348':
Use BaseNetworkObserver in Tethering.
2013-11-26 08:38:40 -08:00
Dan Sandler
99ef026f48
Merge "Keep PhoneStatusBar default constructor around."
2013-11-26 15:27:34 +00:00