OSDN Git Service
Jae Seo [Tue, 8 Apr 2014 20:39:02 +0000 (20:39 +0000)]
am
3957091b: Initial round of Television Input Framework
* commit '
3957091ba8f08c02b5e781098cb955a5f697a1ff':
Initial round of Television Input Framework
Jae Seo [Fri, 21 Feb 2014 02:23:25 +0000 (18:23 -0800)]
Initial round of Television Input Framework
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.
Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
Fabrice Di Meglio [Tue, 8 Apr 2014 20:32:56 +0000 (20:32 +0000)]
am
53c2cf79: Add support for saving and using the Preference\'s key value
* commit '
53c2cf799fddfae7f6fc9ca1840ea345308b79ee':
Add support for saving and using the Preference's key value
Fabrice Di Meglio [Tue, 8 Apr 2014 02:12:41 +0000 (19:12 -0700)]
Add support for saving and using the Preference's key value
- make public and hide the PreferenceGroupAdapter class
- add setActivated(int position) to be able to set the activated item
- udpate getView(int position, View convertView, ViewGroup parent) to set/unset
the activated item
Change-Id: I8a653ad6541bb6b7a043ba7c3d95e5ecad924a0d
Fabrice Di Meglio [Tue, 8 Apr 2014 20:15:41 +0000 (20:15 +0000)]
am
19de4fff: Merge "Add support for key value for SearchIndexableData"
* commit '
19de4ffff3c9ebca70694b55b9784afe86f5c11b':
Add support for key value for SearchIndexableData
Fabrice Di Meglio [Tue, 8 Apr 2014 20:11:27 +0000 (20:11 +0000)]
Merge "Add support for key value for SearchIndexableData"
Ying Wang [Tue, 8 Apr 2014 19:20:26 +0000 (19:20 +0000)]
am
30f05c29: Merge "Fix sdk build."
* commit '
30f05c29c56a04f8d8ab2851d0c20a2b66406cfa':
Fix sdk build.
Ying Wang [Tue, 8 Apr 2014 19:16:46 +0000 (19:16 +0000)]
Merge "Fix sdk build."
Adrian Roos [Tue, 8 Apr 2014 19:14:57 +0000 (19:14 +0000)]
Merge "Enable quick settings from lockscreen and merge into one shade." into master-lockscreen-dev
Ying Wang [Tue, 8 Apr 2014 19:14:50 +0000 (12:14 -0700)]
Fix sdk build.
Change-Id: I3e620315e082b46ba5fcd4511b9c258bf610ddf5
Kenny Guy [Tue, 8 Apr 2014 18:05:44 +0000 (18:05 +0000)]
am
cfd3cd6d: Merge "Pipe notifications from related users to listeners."
* commit '
cfd3cd6df375793d714fe3b6570791e377cab1e5':
Pipe notifications from related users to listeners.
Ying Wang [Tue, 8 Apr 2014 17:59:53 +0000 (17:59 +0000)]
am
777a8e0a: Expose APIs used to be hidden due to Doclava bug.
* commit '
777a8e0aec6d8fd4813e75a39c5611c5cb660f9f':
Expose APIs used to be hidden due to Doclava bug.
Kenny Guy [Tue, 8 Apr 2014 17:59:27 +0000 (17:59 +0000)]
Merge "Pipe notifications from related users to listeners."
Adam Hampson [Tue, 8 Apr 2014 17:44:03 +0000 (17:44 +0000)]
am
1bcdaa88: am
668b1bf8: resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
* commit '
1bcdaa88b249cdf49ba245a01108990c599e5664':
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
Ying Wang [Fri, 4 Apr 2014 04:42:46 +0000 (21:42 -0700)]
Expose APIs used to be hidden due to Doclava bug.
If a class inherits public fields from a hidden interface, they should
be exposed as APIs. A good example is the dozens of constants
java.util.zip.ZipFile inherits form java.util.zip.ZipConstants.
Bug:
13721174
Change-Id: I83cf13c174edf4422bc8ab2be275a47b214e1fa9
Kenny Guy [Mon, 3 Mar 2014 18:24:03 +0000 (18:24 +0000)]
Pipe notifications from related users to listeners.
For Listeners built against L or greater
Send notifications from related users to listeners.
Return notifications from related users getAllActiveNotifications
Cancel notifications from related users in cancelAllNotifications
Deprecate StatusBarNotification.getUserId() and expose getUser()
as APIs should use UserHandles.
Deprecate cancelNotification that takes package, id and tag
in favour of one that takes key.
Fix bug that notifications from related users didn't
trigger sounds.
Change-Id: I1b1c20c9f305b8f3c4047bc5720d8e99cdedfe70
Adam Hampson [Tue, 8 Apr 2014 17:38:35 +0000 (17:38 +0000)]
am
668b1bf8: resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
* commit '
668b1bf80b0e34e7079f826cd9e7358835a1e9cd':
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
Adam Hampson [Tue, 8 Apr 2014 17:24:47 +0000 (10:24 -0700)]
resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
Jorim Jaggi [Tue, 8 Apr 2014 17:06:17 +0000 (17:06 +0000)]
Merge "Force status bar showing when Keyguard is showing." into master-lockscreen-dev
Jorim Jaggi [Tue, 8 Apr 2014 13:13:05 +0000 (15:13 +0200)]
Force status bar showing when Keyguard is showing.
Bug:
13635952
Change-Id: I5015f17010c853f70f5622b774b2c5b4e1d8332f
Adrian Roos [Tue, 8 Apr 2014 13:52:18 +0000 (15:52 +0200)]
Enable quick settings from lockscreen and merge into one shade.
Change-Id: Ic5b5f54bcfe3816549287f707715e29340522d9b
Adam Hampson [Tue, 8 Apr 2014 15:51:22 +0000 (15:51 +0000)]
Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
Leon Scroggins III [Tue, 8 Apr 2014 14:43:48 +0000 (14:43 +0000)]
am
560d1d9c: Merge "Remove SkFloatToScalar."
* commit '
560d1d9cb24498643cea26c35a1a2481b70a9e68':
Remove SkFloatToScalar.
Leon Scroggins III [Tue, 8 Apr 2014 14:39:49 +0000 (14:39 +0000)]
Merge "Remove SkFloatToScalar."
Adrian Roos [Tue, 8 Apr 2014 14:12:23 +0000 (14:12 +0000)]
Merge "Add a temporary user switcher to quick settings" into master-lockscreen-dev
Adrian Roos [Thu, 3 Apr 2014 14:51:58 +0000 (16:51 +0200)]
Add a temporary user switcher to quick settings
Change-Id: I7ebe29049812fe5ac98b702f3378a1121d5d6bb7
Yohei Yukawa [Tue, 8 Apr 2014 05:52:14 +0000 (05:52 +0000)]
am
59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
* commit '
59fee2d5534965f0986e68e0c3562da5e65e6c45':
Allow IMEs to start/stop receiving onUpdateCursor callback
Yohei Yukawa [Tue, 8 Apr 2014 05:48:45 +0000 (05:48 +0000)]
Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
John Reck [Tue, 8 Apr 2014 02:56:33 +0000 (02:56 +0000)]
am
1f3f55b4: Merge "Enable RT, round 2"
* commit '
1f3f55b434ce324c5fdbe74db1982fea4812a2e9':
Enable RT, round 2
John Reck [Tue, 8 Apr 2014 02:50:22 +0000 (02:50 +0000)]
Merge "Enable RT, round 2"
John Reck [Tue, 8 Apr 2014 02:38:59 +0000 (19:38 -0700)]
Enable RT, round 2
Change-Id: I8035f477f67ede9a5cd1b4de4498bc7850c7fbf3
Baligh Uddin [Tue, 8 Apr 2014 02:31:00 +0000 (02:31 +0000)]
am
086ed8f0: (-s ours) am
56868fbc: (-s ours) am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
086ed8f05577394e279b9cac6fe632654dbe5b83':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:11 +0000 (02:24 +0000)]
am
56868fbc: (-s ours) am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
56868fbcd9b086219c4350ac34b5dfdde127c5b9':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:20:37 +0000 (02:20 +0000)]
am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:20:24 +0000 (02:20 +0000)]
am
ff17bc9c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
ff17bc9cac2f9b178fcbfe3a0af307b4d16c2389':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:20:21 +0000 (02:20 +0000)]
am
d0ce581e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
d0ce581e61af91158bf7e6f9ceecc4ab91d1369e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:16:43 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 8 Apr 2014 02:16:41 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
Baligh Uddin [Tue, 8 Apr 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 8 Apr 2014 02:16:33 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 8 Apr 2014 02:16:31 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
Alan Viverette [Tue, 8 Apr 2014 02:06:14 +0000 (02:06 +0000)]
am
a75ee14e: Update APIs to fix build
* commit '
a75ee14e6739ddc243d0ba905f48e9c22323c9fd':
Update APIs to fix build
Alan Viverette [Tue, 8 Apr 2014 01:59:51 +0000 (18:59 -0700)]
Update APIs to fix build
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
Eric Laurent [Tue, 8 Apr 2014 01:27:35 +0000 (01:27 +0000)]
am
f5325314: Merge "Revert "Initial implementation of USB Audio output.""
* commit '
f5325314ccb6809de95c9c4fa2304fe87537640a':
Revert "Initial implementation of USB Audio output."
Eric Laurent [Tue, 8 Apr 2014 01:23:21 +0000 (01:23 +0000)]
Merge "Revert "Initial implementation of USB Audio output.""
John Reck [Tue, 8 Apr 2014 01:09:06 +0000 (01:09 +0000)]
Eric Laurent [Tue, 8 Apr 2014 01:01:29 +0000 (18:01 -0700)]
Revert "Initial implementation of USB Audio output."
This reverts commit
3af0fe0c9df2fc1e0a4d6bcd827a4d7aa28dbdeb
while investigating issues
13751080 and
13883978.
Bug:
13751080.
John Reck [Tue, 8 Apr 2014 00:31:44 +0000 (17:31 -0700)]
Veto pool TODO
Change-Id: I50067dba630b75aa539e4406cfc15f66949684b3
John Reck [Tue, 8 Apr 2014 00:37:16 +0000 (00:37 +0000)]
am
85189c5d: Merge "Fence on draws that are reported"
* commit '
85189c5dafb08f051c7024f42ceedcbcf5dbbc7c':
Fence on draws that are reported
John Reck [Tue, 8 Apr 2014 00:32:15 +0000 (00:32 +0000)]
Merge "Fence on draws that are reported"
Alan Viverette [Tue, 8 Apr 2014 00:01:38 +0000 (00:01 +0000)]
am
af22ce47: Merge "Color theming for VectorDrawable, general clean up"
* commit '
af22ce470112b8ee2ea7edf17b5d7c78e92d8ff7':
Color theming for VectorDrawable, general clean up
John Reck [Mon, 7 Apr 2014 23:59:25 +0000 (16:59 -0700)]
Fence on draws that are reported
Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
Alan Viverette [Mon, 7 Apr 2014 23:55:29 +0000 (23:55 +0000)]
Merge "Color theming for VectorDrawable, general clean up"
Alan Viverette [Mon, 7 Apr 2014 23:50:46 +0000 (16:50 -0700)]
Color theming for VectorDrawable, general clean up
BUG:
13878079
Change-Id: I831d26fe3a2658161fc24e947bce382d0be6b548
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
(cherry picked from commit
b3802a8e2360aaa0a88faa625e15c31b56eaf125)
Bug:
13763685
Bug:
13763900
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
George Mount [Mon, 7 Apr 2014 23:34:35 +0000 (23:34 +0000)]
am
f7fbe099: Merge "Allow opaque windows to become translucent."
* commit '
f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
Allow opaque windows to become translucent.
George Mount [Mon, 7 Apr 2014 23:28:43 +0000 (23:28 +0000)]
Merge "Allow opaque windows to become translucent."
John Reck [Mon, 7 Apr 2014 22:45:04 +0000 (22:45 +0000)]
am
96c637e9: Merge "Refcount RenderNode"
* commit '
96c637e9414600a67c71014274e7757161dcc709':
Refcount RenderNode
John Reck [Mon, 7 Apr 2014 22:42:21 +0000 (22:42 +0000)]
Merge "Refcount RenderNode"
Leon Scroggins III [Fri, 4 Apr 2014 21:05:24 +0000 (17:05 -0400)]
Remove SkFloatToScalar.
Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.
BUG:
13694396
Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
Craig Mautner [Mon, 7 Apr 2014 22:30:00 +0000 (22:30 +0000)]
am
8ea553d0: am
8f2adcb1: am
228cefa8: am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
8ea553d03a84e2fc3ded507dd978fca0dee22e77':
[ActivityManager] Reduce report ANR on wrong activity.
Deepanshu Gupta [Mon, 7 Apr 2014 22:29:57 +0000 (22:29 +0000)]
am
e9abc279: Merge "Fix theme/style resolution in Layoutlib"
* commit '
e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b':
Fix theme/style resolution in Layoutlib
Craig Mautner [Mon, 7 Apr 2014 22:27:55 +0000 (22:27 +0000)]
am
8f2adcb1: am
228cefa8: am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
[ActivityManager] Reduce report ANR on wrong activity.
Deepanshu Gupta [Mon, 7 Apr 2014 22:27:01 +0000 (22:27 +0000)]
Merge "Fix theme/style resolution in Layoutlib"
Craig Mautner [Mon, 7 Apr 2014 22:21:33 +0000 (22:21 +0000)]
am
228cefa8: am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
228cefa83dd7b95e5581f619bb597808af726f80':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:14:56 +0000 (22:14 +0000)]
am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
3fb2b7132b64c65163e7c6cd948e45f703e93687':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:10:47 +0000 (22:10 +0000)]
Merge "[ActivityManager] Reduce report ANR on wrong activity."
John Reck [Fri, 4 Apr 2014 23:20:08 +0000 (16:20 -0700)]
Refcount RenderNode
Change-Id: I7a86db8acc2b78ef33d987a43a119f5933d7d752
Adam Hampson [Mon, 7 Apr 2014 21:44:37 +0000 (21:44 +0000)]
am
5951c83d: am
ec571bd2: (-s ours) am
ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit '
5951c83dfb38d7a3a01b5f2efc056929d20f647e':
DO NOT MERGE Fix several bad function definitions.
Adam Hampson [Mon, 7 Apr 2014 21:40:00 +0000 (21:40 +0000)]
am
ec571bd2: (-s ours) am
ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit '
ec571bd203bb543aa1489e0c0a8bb67f5491630e':
DO NOT MERGE Fix several bad function definitions.
Adam Hampson [Mon, 7 Apr 2014 21:33:54 +0000 (21:33 +0000)]
am
ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit '
ce802f4898c5747038584596d9d689ca30c34c4e':
DO NOT MERGE Fix several bad function definitions.
Adam Hampson [Mon, 7 Apr 2014 21:27:53 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
Robert Greenwalt [Mon, 7 Apr 2014 21:04:30 +0000 (21:04 +0000)]
am
124af561: am
4455c599: (-s ours) am
0468e3c7: am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConf
* commit '
124af56165e7974748546ac2f243d4db8218f7b6':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:59:05 +0000 (20:59 +0000)]
am
4455c599: (-s ours) am
0468e3c7: am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4455c5999f72daaf6f15c4394e413976f14337d3':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:56:18 +0000 (20:56 +0000)]
am
fa306850: am
f00b906f: (-s ours) am
cb163c68: am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-de
* commit '
fa30685038de6e812fe34b9b087f8c8a0785c737':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:52:59 +0000 (20:52 +0000)]
am
0468e3c7: am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
0468e3c7fae6945e21314ae2971c51dcb36972ee':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:50:46 +0000 (20:50 +0000)]
am
f00b906f: (-s ours) am
cb163c68: am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
f00b906f01319a8177d2e2ab109ff01016b0bf4c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:46:58 +0000 (20:46 +0000)]
am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:43:55 +0000 (20:43 +0000)]
am
cb163c68: am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
cb163c684d7a364684ef5b1a1937aa2e92856906':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:41:00 +0000 (20:41 +0000)]
am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
331fa429cad1f464f0375a3466ba528b03c6e90d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:37:38 +0000 (20:37 +0000)]
am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:34:49 +0000 (20:34 +0000)]
am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:31:45 +0000 (20:31 +0000)]
am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
5f3c0630e488bbcee687933b6350370a42354dc4':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 20:28:07 +0000 (20:28 +0000)]
am
365fdc5c: Merge "Revert action bar theme attribute"
* commit '
365fdc5c5bb761c450948345702beb3a1763ad9a':
Revert action bar theme attribute
Robert Greenwalt [Mon, 7 Apr 2014 20:27:50 +0000 (20:27 +0000)]
am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
463eeb70938403bdca2519d9b71911aab93b9277':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)]
am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
522bd7fb3468bc07133c7ff1a02033dcced740b9':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)]
Merge "Revert action bar theme attribute"
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 20:21:38 +0000 (13:21 -0700)]
Revert action bar theme attribute
BUG:
13878093
Change-Id: I7cc4e270854f66d604a6e22eafbeef37c968fdae
Robert Greenwalt [Mon, 7 Apr 2014 20:18:41 +0000 (20:18 +0000)]
am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
24444abff4ad45b731d4f6cd92afed79568773d8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 19:57:07 +0000 (19:57 +0000)]
am
054ff085: Merge "Fix dialog width"
* commit '
054ff085f632a4796fe7bf024fc23d6c8a71011e':
Fix dialog width
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 19:52:17 +0000 (19:52 +0000)]
Merge "Fix dialog width"
OSDN Git Service
