The Android Open Source Project
|
ce84880b45
|
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Id053dd82525fdf0244797e5c641aca8d122d8b4b
|
2012-05-16 08:41:06 -07:00 |
|
The Android Automerger
|
269278f6a4
|
merge in nakasi-factoryrom-release history after reset to jb-dev
|
2012-05-16 07:46:35 -07:00 |
|
The Android Automerger
|
c9bc4b5cd4
|
merge in jb-release history after reset to jb-dev
|
2012-05-16 07:05:26 -07:00 |
|
Russell Brenner
|
433a644d48
|
am 43002b63: am e99006f7: Merge "Add wps icon to wifi panel" into jb-dev
* commit '43002b6384a2ac85aa9f0256d35b88d5b6f8d36e':
Add wps icon to wifi panel
|
2012-05-15 20:39:06 -07:00 |
|
Russell Brenner
|
43002b6384
|
am e99006f7: Merge "Add wps icon to wifi panel" into jb-dev
* commit 'e99006f75b2639dbe910a318516f13b13af47480':
Add wps icon to wifi panel
|
2012-05-15 20:34:12 -07:00 |
|
Eric Fischer
|
cb4a95e87a
|
am 587cec30: (-s ours) am f6c5c743: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '587cec3049067c3353bc3cc236b0f3a9e2063f02':
Import translations. DO NOT MERGE
|
2012-05-15 20:32:48 -07:00 |
|
Eric Fischer
|
587cec3049
|
am f6c5c743: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'f6c5c743a2164223db88e5c29c851d80fea16613':
Import translations. DO NOT MERGE
|
2012-05-15 20:29:58 -07:00 |
|
Russell Brenner
|
e99006f75b
|
Merge "Add wps icon to wifi panel" into jb-dev
|
2012-05-15 20:28:38 -07:00 |
|
Eric Fischer
|
21cb6a45fc
|
Merge "Import translations. DO NOT MERGE"
|
2012-05-15 18:43:56 -07:00 |
|
Eric Fischer
|
ab814f8443
|
Import translations. DO NOT MERGE
Change-Id: Id9240774507b88d11c0aaad777e32a9bd21e1da1
|
2012-05-15 18:30:06 -07:00 |
|
Eric Fischer
|
f6c5c743a2
|
Merge "Import translations. DO NOT MERGE" into jb-dev
|
2012-05-15 18:29:29 -07:00 |
|
Eric Fischer
|
5a6ecb42c8
|
Import translations. DO NOT MERGE
Change-Id: I97a3edb9a21d768a31e239ff882d802c00b137ec
|
2012-05-15 18:28:12 -07:00 |
|
Dianne Hackborn
|
9f329209b1
|
am 3f037417: am efb717bc: Merge "Okay F* you, CHAR LIMIT." into jb-dev
* commit '3f03741746002c6632b4f407537561a28a4f4886':
Okay F* you, CHAR LIMIT.
|
2012-05-15 17:46:10 -07:00 |
|
Dianne Hackborn
|
3f03741746
|
am efb717bc: Merge "Okay F* you, CHAR LIMIT." into jb-dev
* commit 'efb717bc2dcbaa00ed2d9bde5b9f9463d54262c6':
Okay F* you, CHAR LIMIT.
|
2012-05-15 17:42:19 -07:00 |
|
Dianne Hackborn
|
efb717bc2d
|
Merge "Okay F* you, CHAR LIMIT." into jb-dev
|
2012-05-15 17:36:55 -07:00 |
|
Amith Yamasani
|
782bb8896d
|
am 58e638ec: am b9441710: Rename and flip meaning of auto-rotate to rotation lock.
* commit '58e638ecacad02bddc0e640a3ce78e5a7c6f6f91':
Rename and flip meaning of auto-rotate to rotation lock.
|
2012-05-15 17:11:55 -07:00 |
|
Amith Yamasani
|
58e638ecac
|
am b9441710: Rename and flip meaning of auto-rotate to rotation lock.
* commit 'b94417109279fb7d27f0b27c97e76860ed6446ba':
Rename and flip meaning of auto-rotate to rotation lock.
|
2012-05-15 17:08:00 -07:00 |
|
Dianne Hackborn
|
ebe64e0f8b
|
Okay F* you, CHAR LIMIT.
Change-Id: Id3e149c7a19622b64b80c9f159a8d9a45ba1ef25
|
2012-05-15 16:59:41 -07:00 |
|
Russell Brenner
|
fc1281e6a8
|
Add wps icon to wifi panel
Bug: 6449333
Change-Id: Iba74e895105253594bcfe8f0d98353714a816065
|
2012-05-15 16:16:43 -07:00 |
|
Amith Yamasani
|
b944171092
|
Rename and flip meaning of auto-rotate to rotation lock.
Bug: 6485348
Change-Id: I17359db3156641a69f6841d4e0c48708b5fafe4e
|
2012-05-15 16:15:40 -07:00 |
|
Jeff Sharkey
|
33b5c3539a
|
Clear references after Data Usage View removed.
Bug: 6450986
Change-Id: Ia28479983fc192cbeefb16b8ce03f67241e4002c
|
2012-05-15 15:51:06 -07:00 |
|
Jeff Sharkey
|
8defdc1d12
|
am 064c2ffe: am 9ca54ef6: Merge "Fix layout bounds spelling." into jb-dev
* commit '064c2ffeac0d4614a81d9a43be0a7af587e624f0':
Fix layout bounds spelling.
|
2012-05-15 13:39:33 -07:00 |
|
Jeff Sharkey
|
064c2ffeac
|
am 9ca54ef6: Merge "Fix layout bounds spelling." into jb-dev
* commit '9ca54ef68897b96111514981e1a4dc7a603da00d':
Fix layout bounds spelling.
|
2012-05-15 13:36:11 -07:00 |
|
Jeff Sharkey
|
9ca54ef688
|
Merge "Fix layout bounds spelling." into jb-dev
|
2012-05-15 13:31:36 -07:00 |
|
Jeff Sharkey
|
a982dea051
|
Fix layout bounds spelling.
Change-Id: I6c09f9a332d83aeb92ac2afe1aa120bf544b596e
|
2012-05-15 13:24:46 -07:00 |
|
Jeff Sharkey
|
f197bd6d1f
|
am c50ab5b6: am 44459c0a: Merge "Clear references after Data Usage View removed." into jb-dev
* commit 'c50ab5b6bce8481718fd1da9cd218a2d7438f0a0':
Clear references after Data Usage View removed.
|
2012-05-15 12:48:32 -07:00 |
|
Jeff Sharkey
|
c50ab5b6bc
|
am 44459c0a: Merge "Clear references after Data Usage View removed." into jb-dev
* commit '44459c0a7619286dc0d9c95dc20205971b6f419b':
Clear references after Data Usage View removed.
|
2012-05-15 12:45:27 -07:00 |
|
Jeff Sharkey
|
44459c0a76
|
Merge "Clear references after Data Usage View removed." into jb-dev
|
2012-05-15 12:43:45 -07:00 |
|
Jeff Sharkey
|
00f67699fd
|
am cc62db80: am cda0663e: Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev
* commit 'cc62db8040b0d745816d7aacce1045d3c067589d':
Enforce READ_EXTERNAL in Developer Options.
|
2012-05-15 11:47:22 -07:00 |
|
Irfan Sheriff
|
8beceb20a1
|
am 3beaff96: am 53fa78fc: Merge "Push wifi direct to overflow menu" into jb-dev
* commit '3beaff9641c663118a616fd3272969ba583d9a83':
Push wifi direct to overflow menu
|
2012-05-15 11:47:22 -07:00 |
|
Jeff Sharkey
|
cc62db8040
|
am cda0663e: Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev
* commit 'cda0663eb9c3a324c543c504647c7661f2ac7b35':
Enforce READ_EXTERNAL in Developer Options.
|
2012-05-15 11:41:54 -07:00 |
|
Irfan Sheriff
|
3beaff9641
|
am 53fa78fc: Merge "Push wifi direct to overflow menu" into jb-dev
* commit '53fa78fcb237e52733d00a93a29485c4b3d7d290':
Push wifi direct to overflow menu
|
2012-05-15 11:41:54 -07:00 |
|
Jeff Sharkey
|
cda0663eb9
|
Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev
|
2012-05-15 11:39:17 -07:00 |
|
Irfan Sheriff
|
53fa78fcb2
|
Merge "Push wifi direct to overflow menu" into jb-dev
|
2012-05-15 11:39:02 -07:00 |
|
Jim Miller
|
d12609f4e9
|
am f1f3f2a6: am 6da25703: Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev
* commit 'f1f3f2a63e584f2f22bd094cf4d78cb665ec17c3':
Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout
|
2012-05-15 11:37:40 -07:00 |
|
Amith Yamasani
|
949b436b08
|
am f1b02c8b: am 904bc315: Merge "Fix NPE in Display Settings." into jb-dev
* commit 'f1b02c8b1ae346bc27172595a8ccc9494849f10a':
Fix NPE in Display Settings.
|
2012-05-15 11:37:39 -07:00 |
|
Eric Laurent
|
a2461eb9bd
|
am 50fcedf7: am 10636840: Merge "Implement new volume display policy." into jb-dev
* commit '50fcedf7761ad8ad31fad876eae7176ed44cbd00':
Implement new volume display policy.
|
2012-05-15 11:37:39 -07:00 |
|
Danielle Millett
|
8e41157b34
|
am 5177a7d8: am 1cbd519e: Merge "Removing the blink checkbox and strings" into jb-dev
* commit '5177a7d853526cde2b8362f9f27f27dd033edea5':
Removing the blink checkbox and strings
|
2012-05-15 11:37:38 -07:00 |
|
Eric Fischer
|
91c03e0e44
|
am 34eeb2b3: (-s ours) am 7978ef63: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '34eeb2b3e92e329d8a088352e1eb17af769b22fa':
Import translations. DO NOT MERGE
|
2012-05-15 11:37:38 -07:00 |
|
Daisuke Miyakawa
|
f07dc694fb
|
am c7b53cd8: am 16d91c19: Modify menu layout for sound setting
* commit 'c7b53cd85cc3e5699098d072fd1bbb372a5ea755':
Modify menu layout for sound setting
|
2012-05-15 11:37:37 -07:00 |
|
Jeff Sharkey
|
02b327e7f2
|
Clear references after Data Usage View removed.
Bug: 6450986
Change-Id: Ia28479983fc192cbeefb16b8ce03f67241e4002c
|
2012-05-15 11:33:59 -07:00 |
|
Irfan Sheriff
|
0c925dc715
|
Push wifi direct to overflow menu
Bug: 6469022
Change-Id: I62e4b4372416a5fbaf43a52be71f7291b761997b
|
2012-05-15 11:32:21 -07:00 |
|
Jim Miller
|
f1f3f2a63e
|
am 6da25703: Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev
* commit '6da25703db587c5414df734baf9ac7e5cb504b70':
Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout
|
2012-05-15 11:31:52 -07:00 |
|
Amith Yamasani
|
f1b02c8b1a
|
am 904bc315: Merge "Fix NPE in Display Settings." into jb-dev
* commit '904bc3155f06a1b02ac8a5985ac781d8d6dee798':
Fix NPE in Display Settings.
|
2012-05-15 11:31:25 -07:00 |
|
Eric Laurent
|
50fcedf776
|
am 10636840: Merge "Implement new volume display policy." into jb-dev
* commit '106368400d4798e14daf3c32100bc87c35a480b0':
Implement new volume display policy.
|
2012-05-15 11:30:51 -07:00 |
|
Danielle Millett
|
5177a7d853
|
am 1cbd519e: Merge "Removing the blink checkbox and strings" into jb-dev
* commit '1cbd519ebc8f9c93563a796fa404492678388b31':
Removing the blink checkbox and strings
|
2012-05-15 11:30:48 -07:00 |
|
Eric Fischer
|
34eeb2b3e9
|
am 7978ef63: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '7978ef631ab861130ec0fa2713692bccf5edbbaf':
Import translations. DO NOT MERGE
|
2012-05-15 11:30:00 -07:00 |
|
Daisuke Miyakawa
|
c7b53cd85c
|
am 16d91c19: Modify menu layout for sound setting
* commit '16d91c19dcabea63f38757ab5cafb56c29ad22e8':
Modify menu layout for sound setting
|
2012-05-15 11:29:55 -07:00 |
|
The Android Automerger
|
58a6017662
|
merge in nakasi-factoryrom-release history after reset to jb-dev
|
2012-05-15 09:36:06 -07:00 |
|
The Android Automerger
|
4f03c1042c
|
merge in jb-release history after reset to jb-dev
|
2012-05-15 07:06:02 -07:00 |
|