OSDN Git Service
ztenghui [Fri, 25 Apr 2014 15:52:57 +0000 (15:52 +0000)]
am
7bfe9c45: Merge "Format the xml files for the VectorDrawableTest"
* commit '
7bfe9c450db1bafb0a5469b94afcc81ae003e13a':
Format the xml files for the VectorDrawableTest
Chris Craik [Fri, 25 Apr 2014 15:52:52 +0000 (15:52 +0000)]
am
06916dcb: Merge "Add floats-only drawRoundRect to Canvas"
* commit '
06916dcb05eeee8c809bb18d170a3f73b5ee1427':
Add floats-only drawRoundRect to Canvas
Kenny Root [Fri, 25 Apr 2014 15:52:29 +0000 (15:52 +0000)]
am
97efc15b: Merge "PackageManager: remove GET_CERTIFICATES boolean"
* commit '
97efc15b32b61a5deb1f54c6c08844b788785c39':
PackageManager: remove GET_CERTIFICATES boolean
Jorim Jaggi [Fri, 25 Apr 2014 15:52:20 +0000 (15:52 +0000)]
am
fb2b6bc6: Merge "Add text view for double-tap and unlock hint on Keyguard."
* commit '
fb2b6bc62d54a6abdc2ec61c2299e060b6ae6671':
Add text view for double-tap and unlock hint on Keyguard.
Dianne Hackborn [Fri, 25 Apr 2014 15:51:51 +0000 (15:51 +0000)]
Jeff Davidson [Fri, 25 Apr 2014 15:51:47 +0000 (15:51 +0000)]
am
ede08340: Merge "API tweaks for network score settings."
* commit '
ede08340e1ac6b783cba52944474c28013f59cf9':
API tweaks for network score settings.
Nick Kralevich [Fri, 25 Apr 2014 14:57:50 +0000 (14:57 +0000)]
am
38897b30: am
69ee6b0a: am
140dc63f: am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
38897b30b792589ba1777c8eded23d9ab2647921':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
ztenghui [Thu, 24 Apr 2014 22:17:01 +0000 (22:17 +0000)]
Merge "Format the xml files for the VectorDrawableTest"
Chris Craik [Thu, 24 Apr 2014 21:56:41 +0000 (21:56 +0000)]
Merge "Add floats-only drawRoundRect to Canvas"
Chris Craik [Thu, 24 Apr 2014 21:13:40 +0000 (14:13 -0700)]
Add floats-only drawRoundRect to Canvas
Change-Id: Ib0033a2d2486a808a44984ec4adf7fef76d9ea17
Evan Charlton [Thu, 24 Apr 2014 20:56:19 +0000 (13:56 -0700)]
resolved conflicts for merge of
806047ca to master-nova
Change-Id: I6754198919b952bd733733572f64a316cb41b101
Kenny Root [Thu, 24 Apr 2014 20:51:49 +0000 (20:51 +0000)]
Merge "PackageManager: remove GET_CERTIFICATES boolean"
Kenny Root [Thu, 24 Apr 2014 20:38:03 +0000 (13:38 -0700)]
PackageManager: remove GET_CERTIFICATES boolean
This is a really old debugging flag that is not useful and also
dangerous.
Change-Id: I3badb5e361a8fe8458a355bf7d9ab055cb1b57d5
Jorim Jaggi [Thu, 24 Apr 2014 20:34:30 +0000 (20:34 +0000)]
Merge "Add text view for double-tap and unlock hint on Keyguard."
Jorim Jaggi [Thu, 24 Apr 2014 20:08:30 +0000 (22:08 +0200)]
Add text view for double-tap and unlock hint on Keyguard.
Bug:
14080971
Change-Id: Id6f7344b01bb9666fe6add415ec4a28163315967
Dianne Hackborn [Thu, 24 Apr 2014 19:00:29 +0000 (19:00 +0000)]
Merge "Fix api."
Dianne Hackborn [Thu, 24 Apr 2014 18:59:49 +0000 (11:59 -0700)]
Fix api.
Change-Id: I5a04152a55b277b8609b033a0c35db30458e1ee2
Jeff Davidson [Thu, 24 Apr 2014 18:58:56 +0000 (18:58 +0000)]
Merge "API tweaks for network score settings."
Nick Kralevich [Thu, 24 Apr 2014 18:29:50 +0000 (18:29 +0000)]
am
69ee6b0a: am
140dc63f: am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
69ee6b0a774346af5e621907a0508c02468b4186':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Dianne Hackborn [Thu, 24 Apr 2014 18:28:32 +0000 (18:28 +0000)]
Merge "Start collecting mobile radio activity from the radio."
Adam Powell [Thu, 24 Apr 2014 18:27:37 +0000 (18:27 +0000)]
am
46ca5060: Merge "Nested scrolling!"
* commit '
46ca506022cb51543dea0489587477f60c570d5f':
Nested scrolling!
Nick Kralevich [Thu, 24 Apr 2014 18:25:58 +0000 (18:25 +0000)]
am
140dc63f: am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
140dc63f4f927a8eddddf8d11a142e6975c1c6cf':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:22:20 +0000 (18:22 +0000)]
am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
8480384986c314bd97b841cbf7f63acb7055ecef':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Dianne Hackborn [Mon, 21 Apr 2014 22:56:18 +0000 (15:56 -0700)]
Start collecting mobile radio activity from the radio.
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.
Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.
Also add a new API to get estimated drain and charge times.
Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
Adam Powell [Thu, 24 Apr 2014 18:20:43 +0000 (18:20 +0000)]
Merge "Nested scrolling!"
Nick Kralevich [Thu, 24 Apr 2014 18:18:01 +0000 (18:18 +0000)]
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
Daniel Leung [Fri, 20 Dec 2013 18:37:35 +0000 (10:37 -0800)]
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.
Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
ztenghui [Thu, 24 Apr 2014 18:08:05 +0000 (18:08 +0000)]
am
d2cd53d4: Merge "Shoot the rays to the vertices of the incoming polygon."
* commit '
d2cd53d4e525d6cd5e5ff261274f4969e2e8f3fd':
Shoot the rays to the vertices of the incoming polygon.
ztenghui [Thu, 24 Apr 2014 18:02:59 +0000 (18:02 +0000)]
Merge "Shoot the rays to the vertices of the incoming polygon."
Craig Mautner [Thu, 24 Apr 2014 17:50:32 +0000 (17:50 +0000)]
am
5e6e27ed: Merge "Take screenshots of pausing activity"
* commit '
5e6e27edb7d59255d07e2f74dac74e5898cf949b':
Take screenshots of pausing activity
Adam Powell [Tue, 15 Apr 2014 16:46:51 +0000 (09:46 -0700)]
Nested scrolling!
or, "Excuse me, Egon, you said crossing the streams was bad."
Add API for driving a nested scroll from the most deeply nested
applicable scrolling view. The deepest scrolling view dispatches
high-level scrolling events up to cooperative parent views.
Augment ScrollView to support nested scrolling. Next up, more public
framework scrolling views.
Change-Id: I53b5e207fcdece796e08c8592ddb4496b96f600e
Craig Mautner [Thu, 24 Apr 2014 17:44:42 +0000 (17:44 +0000)]
Merge "Take screenshots of pausing activity"
Craig Mautner [Thu, 24 Apr 2014 17:19:20 +0000 (10:19 -0700)]
Take screenshots of pausing activity
Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.
Fixes bug
13410507.
Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
Craig Mautner [Thu, 24 Apr 2014 17:34:10 +0000 (17:34 +0000)]
am
d2cc56eb: resolved conflicts for merge of
f8a58208 to master
* commit '
d2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
Add activity attribute allowEmbedded
Craig Mautner [Thu, 24 Apr 2014 17:27:04 +0000 (10:27 -0700)]
resolved conflicts for merge of
f8a58208 to master
Conflicts:
core/java/android/content/pm/PackageParser.java
core/res/res/values/attrs_manifest.xml
core/res/res/values/public.xml
Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
Alexandra Gherghina [Thu, 24 Apr 2014 17:16:22 +0000 (17:16 +0000)]
am
80021878: Merge "Fix two potential NPEs in DeviceInfo"
* commit '
80021878a840abffafd9c53e70d39ae2eef90841':
Fix two potential NPEs in DeviceInfo
ztenghui [Tue, 22 Apr 2014 22:29:44 +0000 (15:29 -0700)]
Format the xml files for the VectorDrawableTest
All automatically done by the tool.
No real changes.
Change-Id: I8a98be9441d7cb0b3636c2a850d1e7de9e79394f
Alexandra Gherghina [Thu, 24 Apr 2014 17:11:51 +0000 (17:11 +0000)]
Merge "Fix two potential NPEs in DeviceInfo"
Alexandra Gherghina [Thu, 24 Apr 2014 16:55:30 +0000 (17:55 +0100)]
Fix two potential NPEs in DeviceInfo
Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
ztenghui [Tue, 22 Apr 2014 18:21:49 +0000 (11:21 -0700)]
Shoot the rays to the vertices of the incoming polygon.
bug:
13553955
Change-Id: I4825a49e8eaab969c40f2ee4086f7669c9c6fd29
Jeff Davidson [Thu, 17 Apr 2014 19:19:23 +0000 (12:19 -0700)]
API tweaks for network score settings.
Expose "isAppValidScorer" so Settings can call it.
Also rename ACTION_CHANGE_DEFAULT to ACTION_CHANGE_ACTIVE for
consistency with other naming.
Change-Id: I6c2d0099622958f06c2916ca76090e14d5273c86
Craig Mautner [Thu, 24 Apr 2014 16:33:02 +0000 (16:33 +0000)]
am
03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
* commit '
03981a4c2e9689197e4d2c916c07ae16207b5276':
Add activity attribute allowEmbedded
Raph Levien [Thu, 24 Apr 2014 16:30:14 +0000 (16:30 +0000)]
am
79cb5505: am
07bed492: am
e4ee0e31: Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
79cb5505a97a0465fb849dc20dcaf3dd2f608c9f':
Fix bug
14276128 Clipping at bottom of TextView
Craig Mautner [Thu, 24 Apr 2014 16:30:14 +0000 (16:30 +0000)]
Merge "Add activity attribute allowEmbedded" into klp-modular-dev
Raph Levien [Thu, 24 Apr 2014 16:25:21 +0000 (16:25 +0000)]
am
07bed492: am
e4ee0e31: Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
07bed4921a05e717a4b7f10a25e3830e346426b7':
Fix bug
14276128 Clipping at bottom of TextView
Michael Kolb [Thu, 24 Apr 2014 16:22:05 +0000 (16:22 +0000)]
am
83474f5b: am
0fc5f869: am
e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '
83474f5b4d870c12d39cef5ae28b7e3fb6d6a765':
Use rotation to position circular display mask
Raph Levien [Thu, 24 Apr 2014 16:18:08 +0000 (16:18 +0000)]
am
e4ee0e31: Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
e4ee0e3193f8e66cabc5352046969041ad4921e5':
Fix bug
14276128 Clipping at bottom of TextView
Michael Kolb [Thu, 24 Apr 2014 16:16:59 +0000 (16:16 +0000)]
am
0fc5f869: am
e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '
0fc5f86950f6089eb8b4cbc0bf9684b8be090fa3':
Use rotation to position circular display mask
Michael Kolb [Thu, 24 Apr 2014 16:13:41 +0000 (16:13 +0000)]
am
e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '
e597d5f9310f760843272c728d6fb1917abf241a':
Use rotation to position circular display mask
Raph Levien [Thu, 24 Apr 2014 16:12:54 +0000 (16:12 +0000)]
Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
Michael Kolb [Thu, 24 Apr 2014 16:08:21 +0000 (16:08 +0000)]
Merge "Use rotation to position circular display mask" into klp-modular-dev
Michael Kolb [Thu, 24 Apr 2014 05:06:21 +0000 (22:06 -0700)]
Use rotation to position circular display mask
Bug:
14231785
Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
Kenny Guy [Thu, 24 Apr 2014 15:53:14 +0000 (15:53 +0000)]
am
1c299031: Merge "Fix bug with getLauncherActivities ignoring packageName."
* commit '
1c299031982b6145e372aa43a3b8a5c683fad3da':
Fix bug with getLauncherActivities ignoring packageName.
Baligh Uddin [Thu, 24 Apr 2014 15:53:10 +0000 (15:53 +0000)]
am
7cb08dd9: (-s ours) am
d0af9589: (-s ours) am
aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
7cb08dd95eec0d940495d1c29dafce387c7c9d0e':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 24 Apr 2014 15:53:07 +0000 (15:53 +0000)]
am
6c66d1fd: am
7e28afd9: am
7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '
6c66d1fd79968ad286d3cb6477e762d7e8bdc5ec':
Force ActivityView activities to start in new task
Elliott Hughes [Thu, 24 Apr 2014 15:53:04 +0000 (15:53 +0000)]
am
f4567f0c: am
56cc5ba7: am
8d47f23e: am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
f4567f0c50e88261dd897a9933b5d885c1406a45':
Fix a typo in an assertion.
Kenny Guy [Thu, 24 Apr 2014 15:49:08 +0000 (15:49 +0000)]
Merge "Fix bug with getLauncherActivities ignoring packageName."
Baligh Uddin [Thu, 24 Apr 2014 15:43:59 +0000 (15:43 +0000)]
am
d0af9589: (-s ours) am
aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
d0af9589ff8971bb02ee764454e3a46b0c2aebaa':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 24 Apr 2014 15:43:37 +0000 (15:43 +0000)]
am
7e28afd9: am
7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '
7e28afd9568c590c7110f83b252dbb77f165fcb3':
Force ActivityView activities to start in new task
Elliott Hughes [Thu, 24 Apr 2014 15:43:24 +0000 (15:43 +0000)]
am
56cc5ba7: am
8d47f23e: am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
56cc5ba79bdf75a73281dc73f13169a409d96c28':
Fix a typo in an assertion.
Craig Mautner [Thu, 24 Apr 2014 04:38:50 +0000 (21:38 -0700)]
Add activity attribute allowEmbedded
Activitys without allowEmbedded=true may not be launched in an ActivityView.
Fixes bug
13693121.
Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
Alexandra Gherghina [Thu, 24 Apr 2014 15:25:58 +0000 (15:25 +0000)]
am
e255d739: Merge "Modify getUserProfiles to return only enabled profiles:"
* commit '
e255d7399f46de4b4e3d94b95b26df3408274394':
Modify getUserProfiles to return only enabled profiles:
Alexandra Gherghina [Thu, 24 Apr 2014 15:22:09 +0000 (15:22 +0000)]
Merge "Modify getUserProfiles to return only enabled profiles:"
John Spurlock [Thu, 24 Apr 2014 14:39:07 +0000 (14:39 +0000)]
am
10459a54: Merge "Move notification listener management into helper."
* commit '
10459a541171357a18ee897ffcfed0150600fb16':
Move notification listener management into helper.
Baligh Uddin [Thu, 24 Apr 2014 14:34:13 +0000 (14:34 +0000)]
am
6ec0b321: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
6ec0b32173e6eeb643285975489ac95a08f6f315':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:10 +0000 (14:34 +0000)]
am
0dea3a6e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
0dea3a6eeac31fff541c284bbf74f123ac163cd2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:07 +0000 (14:34 +0000)]
am
b2cb3a25: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
b2cb3a25186687abeed573c5105deb5b1b724110':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:04 +0000 (14:34 +0000)]
am
781d1ca2: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
781d1ca2c500b589beb9eaef0221b41b4c6b840b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:02 +0000 (14:34 +0000)]
am
aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
aed314e8f3e53627518222777c2fe89666bfd643':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:01 +0000 (14:34 +0000)]
am
9ea71200: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
9ea712006dce43fbc7c9091b344aba8c11a884f8':
Import translations. DO NOT MERGE
John Spurlock [Thu, 24 Apr 2014 14:32:40 +0000 (14:32 +0000)]
Merge "Move notification listener management into helper."
Baligh Uddin [Thu, 24 Apr 2014 14:28:38 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:31 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 24 Apr 2014 14:28:29 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:19 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:13 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:11 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
George Mount [Thu, 24 Apr 2014 14:15:53 +0000 (14:15 +0000)]
am
19d13817: Merge "Properly filter out excluded views in createAnimators() call."
* commit '
19d138175281c56c16df0d395db17593356547ac':
Properly filter out excluded views in createAnimators() call.
George Mount [Thu, 24 Apr 2014 14:12:16 +0000 (14:12 +0000)]
Merge "Properly filter out excluded views in createAnimators() call."
Kenny Guy [Wed, 23 Apr 2014 20:00:45 +0000 (21:00 +0100)]
Fix bug with getLauncherActivities ignoring packageName.
Change-Id: Ica5817378a24cb4b68e2c99e37cd214d3fde8ba4
Craig Mautner [Thu, 24 Apr 2014 09:11:30 +0000 (09:11 +0000)]
am
7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '
7d2d2272f1dc91f27983797349f8253bfa25e8b4':
Force ActivityView activities to start in new task
Alexandra Gherghina [Thu, 3 Apr 2014 12:37:39 +0000 (13:37 +0100)]
Modify getUserProfiles to return only enabled profiles:
Add a new enabled state for a managed profile.
Expose that as a new API on DevicePolicyManager.
Set the new state when enabling the profile.
Return only enabled profiles from the user manager.
Bug:
13755441
Bug:
13755091
Change-Id: I2907b182e19b3562592da688b3f68ef5f4088557
Elliott Hughes [Thu, 24 Apr 2014 09:01:44 +0000 (09:01 +0000)]
am
8d47f23e: am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
8d47f23e43760dcbf051aaeffff668c3c6340276':
Fix a typo in an assertion.
Craig Mautner [Thu, 24 Apr 2014 04:28:27 +0000 (04:28 +0000)]
Merge "Force ActivityView activities to start in new task" into klp-modular-dev
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:22 +0000 (03:29 +0000)]
am
6dd5a1d3: am
8f9d92c4: (-s ours) am
7406e4b8: am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
6dd5a1d348900f4ebf10c96f0af7166219729024':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:19 +0000 (03:29 +0000)]
am
36ec9c95: am
057dca97: (-s ours) am
1668ae8d: am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
36ec9c9581fac43801e9a9af6b8a2af942f90d22':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:16 +0000 (03:29 +0000)]
am
dba62dc9: am
5dee1a09: (-s ours) am
e17ed922: am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
dba62dc9047c99615aa952a9404109490f28a8d1':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:18 +0000 (03:24 +0000)]
am
8f9d92c4: (-s ours) am
7406e4b8: am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
8f9d92c4ca5233607ca01dac0b3b66fde5539307':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:14 +0000 (03:24 +0000)]
am
057dca97: (-s ours) am
1668ae8d: am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
057dca97d9a486b94c82673a95a7a3933bca9a4d':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:10 +0000 (03:24 +0000)]
am
5dee1a09: (-s ours) am
e17ed922: am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
5dee1a093abc4d6fd197ba2c3be012c9536ba1c5':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:22 +0000 (01:36 +0000)]
am
7406e4b8: am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
7406e4b8102ffd71affd55a9f453c0ecce13a097':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:18 +0000 (01:36 +0000)]
am
1668ae8d: am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
1668ae8d2a29b491c3ae421c5b0eca101fb10824':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:14 +0000 (01:36 +0000)]
am
e17ed922: am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
e17ed922001cf70c48969eb7b10ee2e2557b41f9':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:24 +0000 (01:31 +0000)]
am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
7947ec715d8b4a0c82135553abb4947b61bf802b':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:20 +0000 (01:31 +0000)]
am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
a019e77252f86962b9803042c01b897f7f1aa89f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:15 +0000 (01:31 +0000)]
am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
126f4057a06756fbb1c194b5d9d40f9f922d14ee':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:30:23 +0000 (01:30 +0000)]
am
8deae79d: Merge "Bug fix in layoutlib"
* commit '
8deae79d9f6ddd0e610fde54f1cd8b7087507a22':
Bug fix in layoutlib
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:53 +0000 (01:27 +0000)]
am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
b64732d977c023423cd01d32361a49401d9203cd':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:50 +0000 (01:27 +0000)]
am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
6aaea1bd4aa056335776098cd9dc523e898716f1':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:45 +0000 (01:27 +0000)]
am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
Add view cookies for action bar menus. [DO NOT MERGE]
OSDN Git Service
