OSDN Git Service
Andrew Solovay [Thu, 16 Oct 2014 19:08:37 +0000 (19:08 +0000)]
am
0b7e1baf: am
34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
automerge:
11014fe
* commit '
11014feaed47ef28c0f7782463f99d181261774a':
Moved TV Input Framework (TIF) page out of preview.
Andrew Solovay [Thu, 16 Oct 2014 18:59:59 +0000 (18:59 +0000)]
am
0b7e1baf: am
34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
* commit '
0b7e1bafe5e722bd8c620f8d404e39a2c37d893c':
Moved TV Input Framework (TIF) page out of preview.
Scott Rowe [Thu, 16 Oct 2014 18:39:55 +0000 (18:39 +0000)]
am
f83c56cd: am
a3bc95c5: am
8f93624e: docs: delete preview pages
* commit '
f83c56cd425099e35dab81f01d1892abffc7f72f':
docs: delete preview pages
Prerepa Viswanadham [Thu, 16 Oct 2014 18:39:51 +0000 (18:39 +0000)]
am
06819409: am
56302744: am
248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '
06819409c673b6f93c1df9f7d6949f623ff67192':
Update javadoc comments for getBluetoothLeAdvertiser()
Lorenzo Colitti [Thu, 16 Oct 2014 18:39:46 +0000 (18:39 +0000)]
am
e526668e: am
d04d6c91: am
b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit '
e526668eae7ba79e9558cb2b34486bbae2403fd5':
Allow root and system to bypass the always-on VPN firewall rules
Lorenzo Colitti [Thu, 16 Oct 2014 18:39:41 +0000 (18:39 +0000)]
am
94dbc64c: am
ffd73350: am
917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '
94dbc64c9871d394fc7038c95cc140c52ad35255':
Don't make lockdown VPN source firewall rules over-broad.
Lorenzo Colitti [Thu, 16 Oct 2014 18:39:37 +0000 (18:39 +0000)]
am
5fa2929f: am
24f9a26c: am
28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '
5fa2929f161164c8040a1b1ab35b04d43de6374c':
Propagate network state changes to the LockdownVpnTracker.
Christopher Tate [Thu, 16 Oct 2014 18:39:32 +0000 (18:39 +0000)]
am
31e4eeb2: am
ce39d25f: am
185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '
31e4eeb26f2c843d141f969271cff8e825909788':
Fix spurious restore session timeouts
Scott Rowe [Thu, 16 Oct 2014 18:35:40 +0000 (18:35 +0000)]
am
a3bc95c5: am
8f93624e: docs: delete preview pages
* commit '
a3bc95c50638b869a4d9aa8b0fefb6862b8cdc05':
docs: delete preview pages
Prerepa Viswanadham [Thu, 16 Oct 2014 18:35:33 +0000 (18:35 +0000)]
am
56302744: am
248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '
56302744c4b22342798e3a08c03b34322a8a9dd3':
Update javadoc comments for getBluetoothLeAdvertiser()
Lorenzo Colitti [Thu, 16 Oct 2014 18:35:21 +0000 (18:35 +0000)]
am
d04d6c91: am
b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit '
d04d6c91a311af7a52f05fac5935c9327a990046':
Allow root and system to bypass the always-on VPN firewall rules
Lorenzo Colitti [Thu, 16 Oct 2014 18:35:18 +0000 (18:35 +0000)]
am
ffd73350: am
917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '
ffd7335088d228ac0c56fdc7e2faba79c78572bf':
Don't make lockdown VPN source firewall rules over-broad.
Lorenzo Colitti [Thu, 16 Oct 2014 18:35:14 +0000 (18:35 +0000)]
am
24f9a26c: am
28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '
24f9a26cea200d9452bd922d94f8669d87744f53':
Propagate network state changes to the LockdownVpnTracker.
Christopher Tate [Thu, 16 Oct 2014 18:34:56 +0000 (18:34 +0000)]
am
ce39d25f: am
185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '
ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
Fix spurious restore session timeouts
Geoff Mendal [Thu, 16 Oct 2014 17:56:38 +0000 (17:56 +0000)]
am
c218d8f1: (-s ours) am
00e4d783: (-s ours) am
c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c218d8f19881deed098875e2caf41b7ca9e42133':
Import translations. DO NOT MERGE
Brian Carlstrom [Thu, 16 Oct 2014 17:56:33 +0000 (17:56 +0000)]
am
6580c273: am
d2b82488: am
20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
* commit '
6580c273a51daee08972149f2d2ede8ef6e7a79a':
Set threads' contextClassLoader during LoadedApk.makeApplication.
Geoff Mendal [Thu, 16 Oct 2014 17:56:28 +0000 (17:56 +0000)]
am
551deffb: (-s ours) am
fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
551deffb7679e893ee8df750914cdb978bf2afb5':
Import translations. DO NOT MERGE
Marco Nelissen [Thu, 16 Oct 2014 17:56:21 +0000 (17:56 +0000)]
am
a2d77ed7: am
4683a10f: am
36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '
a2d77ed7d7abc1cf10fb961dd8a64f3a9e323736':
Also consider secondary storage when verifying paths
Dirk Dougherty [Thu, 16 Oct 2014 17:56:16 +0000 (17:56 +0000)]
am
7e4a3aec: am
0cd670b3: am
a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
* commit '
7e4a3aecbd9ebc3c91a50eacfe24293811338df9':
Doc change: Add diffs for API level 21.
Geoff Mendal [Thu, 16 Oct 2014 17:45:58 +0000 (17:45 +0000)]
am
00e4d783: (-s ours) am
c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
00e4d7830cc7834efdcec2a35d130cbc89e16551':
Import translations. DO NOT MERGE
Brian Carlstrom [Thu, 16 Oct 2014 17:45:54 +0000 (17:45 +0000)]
am
d2b82488: am
20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
* commit '
d2b824887f9ec2e3448bd38aae58efbc4f178997':
Set threads' contextClassLoader during LoadedApk.makeApplication.
Geoff Mendal [Thu, 16 Oct 2014 17:45:45 +0000 (17:45 +0000)]
am
fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
fb0356852dad1daeb673cdf117193a8421f66aaa':
Import translations. DO NOT MERGE
Marco Nelissen [Thu, 16 Oct 2014 17:45:36 +0000 (17:45 +0000)]
am
4683a10f: am
36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '
4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
Also consider secondary storage when verifying paths
Dirk Dougherty [Thu, 16 Oct 2014 17:45:31 +0000 (17:45 +0000)]
am
0cd670b3: am
a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
* commit '
0cd670b39be13e1840927694b36d6c61e5c7c1dd':
Doc change: Add diffs for API level 21.
Andrew Solovay [Thu, 16 Oct 2014 17:08:33 +0000 (17:08 +0000)]
am
34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
* commit '
34ef4ff9b7a3625477b0eccd20db15129f2732f3':
Moved TV Input Framework (TIF) page out of preview.
Andrew Solovay [Thu, 16 Oct 2014 17:03:01 +0000 (17:03 +0000)]
Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
Scott Rowe [Thu, 16 Oct 2014 16:44:30 +0000 (16:44 +0000)]
am
8f93624e: docs: delete preview pages
* commit '
8f93624eafd3518d97c88506bbb9a93c81eb7f03':
docs: delete preview pages
Scott Rowe [Wed, 8 Oct 2014 23:39:36 +0000 (16:39 -0700)]
docs: delete preview pages
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
Prerepa Viswanadham [Thu, 16 Oct 2014 16:11:26 +0000 (16:11 +0000)]
am
248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '
248edc3e969217aec1fcce7f324cbae6c46da0a3':
Update javadoc comments for getBluetoothLeAdvertiser()
Prerepa Viswanadham [Wed, 15 Oct 2014 23:36:01 +0000 (16:36 -0700)]
Update javadoc comments for getBluetoothLeAdvertiser()
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities
bug:
18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
Adrian Roos [Thu, 16 Oct 2014 14:56:40 +0000 (14:56 +0000)]
am
ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
* commit '
ccb7a9af271836fde98636d9ce6ebbda09eb0158':
Prevent ChooserActivity from taking over the system bars
Adrian Roos [Thu, 16 Oct 2014 14:54:18 +0000 (14:54 +0000)]
Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
George Mount [Thu, 16 Oct 2014 14:25:45 +0000 (14:25 +0000)]
am
ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
* commit '
ea6f0ae86d62cff88d63b926578c588a956d0512':
Use empty snapshots list when there are no shared elements.
George Mount [Thu, 16 Oct 2014 14:21:41 +0000 (14:21 +0000)]
Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
Lorenzo Colitti [Thu, 16 Oct 2014 09:23:24 +0000 (09:23 +0000)]
am
b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit '
b7d8514822aefbf8274f5464dc12cee151e2b78b':
Allow root and system to bypass the always-on VPN firewall rules
Lorenzo Colitti [Thu, 16 Oct 2014 09:23:21 +0000 (09:23 +0000)]
am
917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '
917c547beb9adecf2e7d2b355e85e37c2557c5d3':
Don't make lockdown VPN source firewall rules over-broad.
Lorenzo Colitti [Thu, 16 Oct 2014 09:23:17 +0000 (09:23 +0000)]
am
28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '
28dcf0345b2857884c1f1639fadb720318445187':
Propagate network state changes to the LockdownVpnTracker.
Lorenzo Colitti [Thu, 16 Oct 2014 08:46:03 +0000 (08:46 +0000)]
Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
Lorenzo Colitti [Thu, 16 Oct 2014 08:45:02 +0000 (08:45 +0000)]
Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev
Lorenzo Colitti [Thu, 16 Oct 2014 08:37:26 +0000 (08:37 +0000)]
Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
Quddus Chong [Thu, 16 Oct 2014 06:49:52 +0000 (06:49 +0000)]
am
7ef4ba61: am
073c80d3: am
0a276b94: Merge "docs: Added L API overview." into lmp-dev
* commit '
7ef4ba61c83871ea02df760729524bfc7c27b8a9':
docs: Added L API overview.
Dirk Dougherty [Thu, 16 Oct 2014 06:49:47 +0000 (06:49 +0000)]
am
b175ee29: am
41d5d14d: am
8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev
* commit '
b175ee295e4e159ca5ac062f7732a5c785c9133b':
Doc change: Add diffs for l-preview -> API level 21.
Geoff Mendal [Thu, 16 Oct 2014 06:49:43 +0000 (06:49 +0000)]
am
7ef55776: (-s ours) am
e134ac1c: (-s ours) am
e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
7ef557764c27efc5766c849b4982c70d05864dfe':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 16 Oct 2014 06:49:38 +0000 (06:49 +0000)]
am
49bb8cdc: am
d1a58c45: am
5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '
49bb8cdc5ecf42bdb66d948a900bee10de1c8323':
Remove unnecessary logging.
Eric Rowe [Thu, 16 Oct 2014 06:49:34 +0000 (06:49 +0000)]
am
ea626e1a: am
de96b966: am
1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev
* commit '
ea626e1af8019786d514d3de0b8a1fa274ca424c':
Add CHANGE_NETWORK_STATE permission to bt tests
Craig Mautner [Thu, 16 Oct 2014 06:49:29 +0000 (06:49 +0000)]
am
d1bba16d: am
87441860: am
e5279105: Merge "Move desired task to top if not already there." into lmp-dev
* commit '
d1bba16da53f927792f489057c1d477b8079876e':
Move desired task to top if not already there.
John Spurlock [Thu, 16 Oct 2014 06:49:24 +0000 (06:49 +0000)]
am
4f7eee43: am
3d4aec1b: am
b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '
4f7eee438be7e51d7988a2a61123139e74b7b802':
Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Evan Charlton [Thu, 16 Oct 2014 06:49:20 +0000 (06:49 +0000)]
am
df88ad0b: am
e8a700e9: am
843e2343: Add WindowManager.aidl to AIDL list
* commit '
df88ad0b81b8b1a6ca76d5961632717165594e9f':
Add WindowManager.aidl to AIDL list
RoboErik [Thu, 16 Oct 2014 06:49:16 +0000 (06:49 +0000)]
am
56d8876f: am
0dfd86e0: am
c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev
* commit '
56d8876f4b9a1a43e4eed0d8b1afff26331cf095':
Don't call size on a null metadata
Quddus Chong [Thu, 16 Oct 2014 05:52:08 +0000 (05:52 +0000)]
am
073c80d3: am
0a276b94: Merge "docs: Added L API overview." into lmp-dev
* commit '
073c80d346e053532092efec9c2c12a3a39d2dcd':
docs: Added L API overview.
Dirk Dougherty [Thu, 16 Oct 2014 05:52:04 +0000 (05:52 +0000)]
am
41d5d14d: am
8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev
* commit '
41d5d14df218d2711be0b16b0f15ddd4cabf3a4f':
Doc change: Add diffs for l-preview -> API level 21.
Geoff Mendal [Thu, 16 Oct 2014 05:52:01 +0000 (05:52 +0000)]
am
e134ac1c: (-s ours) am
e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e134ac1cece66293b31543948fbabc5b7fc64b94':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 16 Oct 2014 05:51:56 +0000 (05:51 +0000)]
am
d1a58c45: am
5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '
d1a58c45fee09c5e599fe173d5055546fe147b03':
Remove unnecessary logging.
Eric Rowe [Thu, 16 Oct 2014 05:51:52 +0000 (05:51 +0000)]
am
de96b966: am
1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev
* commit '
de96b966fb6c8e0694f3a94fc0f42d64090d4fa0':
Add CHANGE_NETWORK_STATE permission to bt tests
Craig Mautner [Thu, 16 Oct 2014 05:51:48 +0000 (05:51 +0000)]
am
87441860: am
e5279105: Merge "Move desired task to top if not already there." into lmp-dev
* commit '
87441860bf4df2da7ce4537ad31c8240547da655':
Move desired task to top if not already there.
John Spurlock [Thu, 16 Oct 2014 05:51:45 +0000 (05:51 +0000)]
am
3d4aec1b: am
b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '
3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Evan Charlton [Thu, 16 Oct 2014 05:51:41 +0000 (05:51 +0000)]
am
e8a700e9: am
843e2343: Add WindowManager.aidl to AIDL list
* commit '
e8a700e9f7956333df647eebe5e8c9eb1ea8c12c':
Add WindowManager.aidl to AIDL list
RoboErik [Thu, 16 Oct 2014 05:51:37 +0000 (05:51 +0000)]
am
0dfd86e0: am
c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev
* commit '
0dfd86e00656573cdd3e28742e93319c96f6ce15':
Don't call size on a null metadata
Christopher Tate [Thu, 16 Oct 2014 03:36:34 +0000 (03:36 +0000)]
am
185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '
185fcadf898f0fe41461a632177dfd0d7e5dfb70':
Fix spurious restore session timeouts
Christopher Tate [Thu, 16 Oct 2014 03:28:58 +0000 (03:28 +0000)]
Merge "Fix spurious restore session timeouts" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 01:56:04 +0000 (01:56 +0000)]
am
c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c71a7b3cb8eb1565c01caaf231773759ee63b4cf':
Import translations. DO NOT MERGE
Brian Carlstrom [Thu, 16 Oct 2014 01:56:00 +0000 (01:56 +0000)]
am
20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
* commit '
20de619d66a594fd9e6e76a3a2cb79422aef577c':
Set threads' contextClassLoader during LoadedApk.makeApplication.
Geoff Mendal [Thu, 16 Oct 2014 01:48:57 +0000 (01:48 +0000)]
am
79469425: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
79469425a170b9f8af20153078fb20d6400beefa':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 01:48:40 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Thu, 16 Oct 2014 01:48:28 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 16 Oct 2014 01:47:17 +0000 (18:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3cf464b7c94c35965e627353765c4ef649c2a209
Auto-generated-cl: translation import
Geoff Mendal [Thu, 16 Oct 2014 01:44:21 +0000 (18:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I245fdc0e9d1b88231970e945521aaf2813a97b44
Auto-generated-cl: translation import
Geoff Mendal [Thu, 16 Oct 2014 01:43:50 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 16 Oct 2014 01:40:57 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I298dbca14148e723e574c299e6ee1d3aebd9b56c
Auto-generated-cl: translation import
Geoff Mendal [Thu, 16 Oct 2014 01:35:17 +0000 (01:35 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 01:34:07 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
Christopher Tate [Thu, 16 Oct 2014 00:49:42 +0000 (17:49 -0700)]
Fix spurious restore session timeouts
The restore-session idle timeout should not be ticking while we're
doing legitimate restore work. We now explicitly stop the timeout
ticker [a delayed message on our handler thread] whenever we undertake
a valid restore operation. The timer is already correctly resumed
when restore operations conclude.
(In practice we need to suspend the timeout tracking at exactly those
times when we're entering the wakelock-protected restore flow. The
timeout is reestablished when the wakelock is released; this part
is already in the code.)
Bug
17990544
Change-Id: I7318020ce30fd9c35bc3a644f8c101fd3d063c8b
Alan Viverette [Thu, 16 Oct 2014 01:21:32 +0000 (01:21 +0000)]
am
b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev
* commit '
b4a29247ffb58f44e50edad7cf56ffc2ea0d7c6b':
Set content description on CalendarView day labels
Alan Viverette [Thu, 16 Oct 2014 01:07:03 +0000 (01:07 +0000)]
Merge "Set content description on CalendarView day labels" into lmp-mr1-dev
Brian Carlstrom [Thu, 16 Oct 2014 01:01:25 +0000 (01:01 +0000)]
Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
Alan Viverette [Thu, 16 Oct 2014 00:52:29 +0000 (00:52 +0000)]
am
05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev
* commit '
0511023432ff24c5ddda563e326273936b5d40f5':
Document Toolbar's vertical alignment strategy
Alan Viverette [Thu, 16 Oct 2014 00:52:24 +0000 (00:52 +0000)]
am
8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev
* commit '
8afc90fd715457033ca70dae3cd53377957d8b94':
Add style support to PopupMenu, clean up constructor javadoc
Alan Viverette [Thu, 16 Oct 2014 00:46:22 +0000 (00:46 +0000)]
Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev
Alan Viverette [Thu, 16 Oct 2014 00:44:34 +0000 (00:44 +0000)]
Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev
Marco Nelissen [Thu, 16 Oct 2014 00:41:10 +0000 (00:41 +0000)]
am
36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '
36c931b31a15b4ed740c861ec34b7e6573cfd32e':
Also consider secondary storage when verifying paths
Marco Nelissen [Thu, 16 Oct 2014 00:38:01 +0000 (00:38 +0000)]
Merge "Also consider secondary storage when verifying paths" into lmp-dev
Adam Powell [Thu, 16 Oct 2014 00:28:16 +0000 (00:28 +0000)]
am
19c0a163: Merge "View measurement optimization" into lmp-mr1-dev
* commit '
19c0a1632f3be67c8cbbee210cd6d8eedfe3649a':
View measurement optimization
Geoff Mendal [Thu, 16 Oct 2014 00:28:11 +0000 (00:28 +0000)]
am
cc29c5ef: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
cc29c5ef825a45cc106ef9891930a9cb52036d13':
Import translations. DO NOT MERGE
Dirk Dougherty [Thu, 16 Oct 2014 00:23:49 +0000 (00:23 +0000)]
am
a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
* commit '
a0b3796d937dff83b5dd94e8f091a36bc9b304dd':
Doc change: Add diffs for API level 21.
Adam Powell [Thu, 16 Oct 2014 00:21:28 +0000 (00:21 +0000)]
Merge "View measurement optimization" into lmp-mr1-dev
Geoff Mendal [Thu, 16 Oct 2014 00:21:25 +0000 (00:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Dirk Dougherty [Thu, 16 Oct 2014 00:20:01 +0000 (00:20 +0000)]
Merge "Doc change: Add diffs for API level 21." into lmp-dev
Alan Viverette [Thu, 16 Oct 2014 00:19:30 +0000 (17:19 -0700)]
Add style support to PopupMenu, clean up constructor javadoc
BUG:
18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
Geoff Mendal [Thu, 16 Oct 2014 00:16:40 +0000 (17:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1232fd67bffa5401e778116a418bbc20902f2723
Auto-generated-cl: translation import
xinhe [Wed, 15 Oct 2014 23:49:13 +0000 (23:49 +0000)]
am
36eaa869: Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev
* commit '
36eaa8690da761a4218a790e18858e4319ffa8d0':
Sprint: MMS proxy authorization does not include NAI
xinhe [Wed, 15 Oct 2014 23:41:52 +0000 (23:41 +0000)]
Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev
Quddus Chong [Wed, 15 Oct 2014 23:41:23 +0000 (23:41 +0000)]
am
0a276b94: Merge "docs: Added L API overview." into lmp-dev
* commit '
0a276b9448d907822bee1c3009608694fc480fcc':
docs: Added L API overview.
Dirk Dougherty [Wed, 15 Oct 2014 23:41:13 +0000 (23:41 +0000)]
am
8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev
* commit '
8ca0f84ea3c6f17e7d0121a87197bfd25f9becfa':
Doc change: Add diffs for l-preview -> API level 21.
Geoff Mendal [Wed, 15 Oct 2014 23:41:05 +0000 (23:41 +0000)]
am
e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e2a1f1cd885ae73fc165f0623697b94668e01c86':
Import translations. DO NOT MERGE
Craig Mautner [Wed, 15 Oct 2014 23:40:54 +0000 (23:40 +0000)]
am
5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '
5d460b88715c8a902eb3930e690ddd1b8d84338f':
Remove unnecessary logging.
Eric Rowe [Wed, 15 Oct 2014 23:40:40 +0000 (23:40 +0000)]
am
1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev
* commit '
1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
Add CHANGE_NETWORK_STATE permission to bt tests
Craig Mautner [Wed, 15 Oct 2014 23:40:11 +0000 (23:40 +0000)]
am
e5279105: Merge "Move desired task to top if not already there." into lmp-dev
* commit '
e52791055c855a957cad767dfa9889faae86660c':
Move desired task to top if not already there.
John Spurlock [Wed, 15 Oct 2014 23:40:07 +0000 (23:40 +0000)]
am
b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '
b2344c81bcf49129d303a2919cfffd7a720c261b':
Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Evan Charlton [Wed, 15 Oct 2014 23:39:57 +0000 (23:39 +0000)]
am
843e2343: Add WindowManager.aidl to AIDL list
* commit '
843e234318421b320e74bb2d09c3b436d82ee127':
Add WindowManager.aidl to AIDL list
RoboErik [Wed, 15 Oct 2014 23:39:29 +0000 (23:39 +0000)]
am
c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev
* commit '
c7be69f1d63bcc8411875ff53e5561f2f4692072':
Don't call size on a null metadata
OSDN Git Service
