git.osdn.net Git - android-x86/frameworks-base.git/log

Andre Eisenbach [Tue, 16 Dec 2014 17:27:46 +0000 (17:27 +0000)]

am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev

* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97':
Don't send the onServiceDisconnected callback after close.

commit | commitdiff | tree

Andre Eisenbach [Tue, 16 Dec 2014 17:21:13 +0000 (17:21 +0000)]

am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev

* commit 'cd460538a4e00cd36be478b00d298a6e2526528f':
Don't send the onServiceDisconnected callback after close.

commit | commitdiff | tree

Andre Eisenbach [Tue, 16 Dec 2014 17:16:53 +0000 (17:16 +0000)]

Merge "Don't send the onServiceDisconnected callback after close." into lmp-mr1-dev

commit | commitdiff | tree

Jason Monk [Tue, 16 Dec 2014 17:05:10 +0000 (17:05 +0000)]

am b1a280a3: am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev

* commit 'b1a280a3ee38af72c6eed10ec9763f1202e63dd8':
Add config to handle periodic check of tether provision

commit | commitdiff | tree

Jason Monk [Tue, 16 Dec 2014 16:59:44 +0000 (16:59 +0000)]

am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev

* commit '052e9b12f5fc7a1e3ecdd126ca8c07298941f291':
Add config to handle periodic check of tether provision

commit | commitdiff | tree

Jason Monk [Tue, 16 Dec 2014 15:44:04 +0000 (15:44 +0000)]

Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev

commit | commitdiff | tree

Benjamin Franz [Tue, 16 Dec 2014 15:33:03 +0000 (15:33 +0000)]

Don't send the onServiceDisconnected callback after close.

Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a

commit | commitdiff | tree

Sarah Maddox [Tue, 16 Dec 2014 02:31:39 +0000 (02:31 +0000)]

am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627

* commit '99c5ac9e14db60abb8186c4737803b4cf90c1dc0':
docs: Updates lesson 1 of location API training: Get last-known location.

commit | commitdiff | tree

smain@google.com [Tue, 16 Dec 2014 02:31:34 +0000 (02:31 +0000)]

am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455

* commit '1d97aebdd96105fd0b24587406acbedec451a5ad':
brute force improve suggestions for sdk download

commit | commitdiff | tree

Rich Slogar [Tue, 16 Dec 2014 02:31:29 +0000 (02:31 +0000)]

am ccaf3552: am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5

* commit 'ccaf3552e62bb7ef2373bd4c282d275a209b7d91':
docs: studio 1.0.1 revision update

commit | commitdiff | tree

smain@google.com [Tue, 16 Dec 2014 02:31:23 +0000 (02:31 +0000)]

am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1

* commit 'f912c21e4325c87798ae6930ca734fb18636f9e5':
fix distribute nav styles. they were not highlighted correctly.

commit | commitdiff | tree

Joe Fernandez [Tue, 16 Dec 2014 02:31:17 +0000 (02:31 +0000)]

am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75

* commit '9a0be7d31da7c340fd1f5b57c9e1527726697fcc':
docs: uiautomator blog link removal

commit | commitdiff | tree

Joe Fernandez [Tue, 16 Dec 2014 02:23:24 +0000 (02:23 +0000)]

am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad

* commit 'e33b63feecf6dc76db716c8064f5a21c751b81d7':
docs: studio basics typo

commit | commitdiff | tree

Luan Nguyen [Tue, 16 Dec 2014 02:23:17 +0000 (02:23 +0000)]

am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880

* commit '443e57df26077652d35b4e294e4a5ed3cd6030b3':
docs: Add two new general functionality requirements

commit | commitdiff | tree

Mark Renouf [Tue, 16 Dec 2014 02:23:11 +0000 (02:23 +0000)]

am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours

* commit '3e4a43e4f5bbf273dcaef049a2c0c1574c62fc82':
If no display settings are matched, return the first one. DO NOT MERGE

commit | commitdiff | tree

Sarah Maddox [Tue, 16 Dec 2014 02:00:46 +0000 (02:00 +0000)]

am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627

* commit '48f9c8e48c5d765afc025c2bda3695d0dd13388e':
docs: Updates lesson 1 of location API training: Get last-known location.

commit | commitdiff | tree

smain@google.com [Tue, 16 Dec 2014 02:00:41 +0000 (02:00 +0000)]

am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455

* commit '9af05a689964ca2563c038484b385e8dfb58ed3d':
brute force improve suggestions for sdk download

commit | commitdiff | tree

Rich Slogar [Tue, 16 Dec 2014 02:00:36 +0000 (02:00 +0000)]

am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5

* commit '579110887d9d5d21ca8ed0b4179b61de3b876410':
docs: studio 1.0.1 revision update

commit | commitdiff | tree

smain@google.com [Tue, 16 Dec 2014 02:00:30 +0000 (02:00 +0000)]

am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1

* commit 'a01e83b2665e32f0ee74ee97b37e12fe1c9ac986':
fix distribute nav styles. they were not highlighted correctly.

commit | commitdiff | tree

Joe Fernandez [Tue, 16 Dec 2014 02:00:24 +0000 (02:00 +0000)]

am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75

* commit '519fbf3ae7dbf27f62321c727e721f29aa89ac92':
docs: uiautomator blog link removal

commit | commitdiff | tree

Joe Fernandez [Tue, 16 Dec 2014 01:54:09 +0000 (01:54 +0000)]

am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad

* commit '9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8':
docs: studio basics typo

commit | commitdiff | tree

Luan Nguyen [Tue, 16 Dec 2014 01:54:03 +0000 (01:54 +0000)]

am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880

* commit '556ce7f145de641e0f920ed3059be5a82eb0bb7b':
docs: Add two new general functionality requirements

commit | commitdiff | tree

Mark Renouf [Tue, 16 Dec 2014 01:53:58 +0000 (01:53 +0000)]

am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours

* commit '1302ee3a2338dec77da81deca51811e31f693c09':
If no display settings are matched, return the first one. DO NOT MERGE

commit | commitdiff | tree

Brian Carlstrom [Tue, 16 Dec 2014 01:46:40 +0000 (01:46 +0000)]

am a00be9b4: Remember failed dexopt to avoid retry
automerge: 2350c7c

* commit '2350c7cb1238ad24b5afaa7f6627b3443d33621b':
Remember failed dexopt to avoid retry

commit | commitdiff | tree

Jay Shrauner [Tue, 16 Dec 2014 01:45:09 +0000 (01:45 +0000)]

am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev
automerge: 59e96ee

* commit '59e96ee423f4fc810f29451144143a581a8cd99a':
Fix NPE in Transport.applyBatch

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Dec 2014 01:43:16 +0000 (01:43 +0000)]

am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev
automerge: 465d123

* commit '465d123464eadf180b618164b2ed23702bca3d86':
AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices

commit | commitdiff | tree

Sarah Maddox [Tue, 16 Dec 2014 01:39:00 +0000 (01:39 +0000)]

am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs
automerge: 8f0f627

* commit '8f0f627e0e76918a57941c71ad49ea6758f68886':
docs: Updates lesson 1 of location API training: Get last-known location.

commit | commitdiff | tree

smain@google.com [Tue, 16 Dec 2014 01:37:42 +0000 (01:37 +0000)]

am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download
automerge: c21b455

* commit 'c21b4553cbdeb8286a49108ec6059871ad81eba2':
brute force improve suggestions for sdk download

commit | commitdiff | tree

Rich Slogar [Tue, 16 Dec 2014 01:36:40 +0000 (01:36 +0000)]

am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update
automerge: b2a9bd5

* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
docs: studio 1.0.1 revision update

commit | commitdiff | tree

smain@google.com [Tue, 16 Dec 2014 01:35:19 +0000 (01:35 +0000)]

am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
automerge: 63ed5e1

* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
fix distribute nav styles. they were not highlighted correctly.

commit | commitdiff | tree

Joe Fernandez [Tue, 16 Dec 2014 01:33:56 +0000 (01:33 +0000)]

am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
docs: uiautomator blog link removal

commit | commitdiff | tree

Joe Fernandez [Tue, 16 Dec 2014 01:32:49 +0000 (01:32 +0000)]

am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
docs: studio basics typo

commit | commitdiff | tree

Luan Nguyen [Tue, 16 Dec 2014 01:30:17 +0000 (01:30 +0000)]

am 47efca78: am a854ddfd: docs: Add two new general functionality requirements
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
docs: Add two new general functionality requirements

commit | commitdiff | tree

Mark Renouf [Tue, 16 Dec 2014 01:29:01 +0000 (01:29 +0000)]

If no display settings are matched, return the first one. DO NOT MERGE
automerge: d3adc51 -s ours

* commit 'd3adc51a1b845e37845af6a885ce7371c2ce252c':
If no display settings are matched, return the first one. DO NOT MERGE

commit | commitdiff | tree

Brian Carlstrom [Tue, 16 Dec 2014 00:55:20 +0000 (00:55 +0000)]

am a00be9b4: Remember failed dexopt to avoid retry

* commit 'a00be9b4d521287fdf4678fb196c3e3a0053c3e4':
Remember failed dexopt to avoid retry

commit | commitdiff | tree

Jay Shrauner [Tue, 16 Dec 2014 00:55:11 +0000 (00:55 +0000)]

am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev

* commit '12b5e504fd3845fed9c649cf01cd27b84fb6742c':
Fix NPE in Transport.applyBatch

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Dec 2014 00:54:59 +0000 (00:54 +0000)]

am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev

* commit '0f0e85a68961e303ac85d31fb36ec8384277349d':
AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices

commit | commitdiff | tree

Brian Carlstrom [Fri, 12 Dec 2014 21:14:36 +0000 (13:14 -0800)]

Remember failed dexopt to avoid retry

Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9

commit | commitdiff | tree

Jay Shrauner [Mon, 15 Dec 2014 23:56:52 +0000 (23:56 +0000)]

Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Mon, 15 Dec 2014 23:35:21 +0000 (23:35 +0000)]

Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Dec 2014 22:41:50 +0000 (22:41 +0000)]

am 93c736b3: am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev

* commit '93c736b3daa9b715814dd20892c1f41b5348f575':
Revert "Revert "Attempt to fix keyguard missing bug""

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Dec 2014 22:35:56 +0000 (22:35 +0000)]

am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev

* commit '613fffcd0f17eecb0231fe24f7abf7936eef8d37':
Revert "Revert "Attempt to fix keyguard missing bug""

commit | commitdiff | tree

Sarah Maddox [Mon, 15 Dec 2014 21:57:02 +0000 (21:57 +0000)]

am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs

* commit 'aaa37da8e0d358317d85e3bc7bfa363c644f5ef1':
docs: Updates lesson 1 of location API training: Get last-known location.

commit | commitdiff | tree

Sarah Maddox [Mon, 15 Dec 2014 21:50:27 +0000 (21:50 +0000)]

am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs

* commit 'a158abe4542742381861d1360a79db2cdd28be57':
docs: Updates lesson 1 of location API training: Get last-known location.

commit | commitdiff | tree

Jay Shrauner [Mon, 15 Dec 2014 20:28:25 +0000 (12:28 -0800)]

Fix NPE in Transport.applyBatch

Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669

commit | commitdiff | tree

Sarah Maddox [Mon, 15 Dec 2014 20:42:36 +0000 (20:42 +0000)]

Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Dec 2014 19:56:44 +0000 (19:56 +0000)]

Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev

commit | commitdiff | tree

Elliott Hughes [Mon, 15 Dec 2014 19:38:04 +0000 (19:38 +0000)]

am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java."

* commit '2a6426c900d319c7b928242694ad050a73ad324b':
Reimplement reopenStdio in Java.

commit | commitdiff | tree

Elliott Hughes [Mon, 15 Dec 2014 19:30:56 +0000 (19:30 +0000)]

am e9e1e0d2: Merge "Reimplement reopenStdio in Java."

* commit 'e9e1e0d20f1f7bae11f5df74d14c7b1be4edc8ac':
Reimplement reopenStdio in Java.

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Dec 2014 19:27:10 +0000 (19:27 +0000)]

am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
Change to treat slotId 0 emergency numbers as default.

commit | commitdiff | tree

Elliott Hughes [Mon, 15 Dec 2014 19:24:52 +0000 (19:24 +0000)]

Merge "Reimplement reopenStdio in Java."

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Dec 2014 19:19:06 +0000 (19:19 +0000)]

am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

* commit 'd060b50b331f540d42c91501d820e3c2601dec18':
Change to treat slotId 0 emergency numbers as default.

commit | commitdiff | tree

Jim Miller [Fri, 12 Dec 2014 21:34:43 +0000 (13:34 -0800)]

Revert "Revert "Attempt to fix keyguard missing bug""

This reverts commit 1991590ddd0ca6d3a0cac290b65120c147034dbc
and fixes a bug where we were showing the scrim on devices without keyguard.

Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Dec 2014 19:06:46 +0000 (19:06 +0000)]

Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

commit | commitdiff | tree

Elliott Hughes [Mon, 15 Dec 2014 19:00:25 +0000 (11:00 -0800)]

Reimplement reopenStdio in Java.

Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3

commit | commitdiff | tree

Amit Mahajan [Fri, 12 Dec 2014 22:30:30 +0000 (14:30 -0800)]

Change to treat slotId 0 emergency numbers as default.

Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34

commit | commitdiff | tree

smain@google.com [Mon, 15 Dec 2014 18:19:05 +0000 (18:19 +0000)]

am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download

* commit '16d9a0378fb1c8fbefb263df2e3d627202ae677d':
brute force improve suggestions for sdk download

commit | commitdiff | tree

smain@google.com [Mon, 15 Dec 2014 18:10:45 +0000 (18:10 +0000)]

am 68e6819b: brute force improve suggestions for sdk download

* commit '68e6819bd023d24894fc7cbb2357c685177d9b84':
brute force improve suggestions for sdk download

commit | commitdiff | tree

smain@google.com [Mon, 15 Dec 2014 18:00:59 +0000 (10:00 -0800)]

brute force improve suggestions for sdk download

Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384

commit | commitdiff | tree

Alan Viverette [Mon, 15 Dec 2014 17:38:25 +0000 (17:38 +0000)]

am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev

* commit '2f11125a7186cc65713804c939a0e538538d9f35':
Give accessibility delegate the first pass at handling ACTION_CLICK

commit | commitdiff | tree

Alan Viverette [Mon, 15 Dec 2014 17:38:19 +0000 (17:38 +0000)]

am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev

* commit '2311ded6a3da117aee221c0cf1168c24160d9041':
Avoid self-recursion if client calls init() from date listener

commit | commitdiff | tree

Alan Viverette [Mon, 15 Dec 2014 17:31:36 +0000 (17:31 +0000)]

am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev

* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
Give accessibility delegate the first pass at handling ACTION_CLICK

commit | commitdiff | tree

Alan Viverette [Mon, 15 Dec 2014 17:31:31 +0000 (17:31 +0000)]

am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev

* commit '2649c58b460c2cd841173a8db513a54180422330':
Avoid self-recursion if client calls init() from date listener

commit | commitdiff | tree

Alan Viverette [Mon, 15 Dec 2014 17:27:18 +0000 (17:27 +0000)]

Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Mon, 15 Dec 2014 17:26:37 +0000 (17:26 +0000)]

Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 15:25:44 +0000 (15:25 +0000)]

am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '301a617698e74bb413df52f93ea7908a33423250':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 15:17:58 +0000 (15:17 +0000)]

am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'd6fc7cf149795abdcd0629e229be52b816ee13c1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 15:17:39 +0000 (15:17 +0000)]

am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'b73e02cf5c736a944155b9d4586d8e8a6e40dc6e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 15:11:23 +0000 (15:11 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 15:10:36 +0000 (15:10 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:56:40 +0000 (06:56 -0800)]

Import translations. DO NOT MERGE

Change-Id: I1631f2d7e5eca790da4ce7b78e90c626f96be23c
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:50:18 +0000 (06:50 -0800)]

Import translations. DO NOT MERGE

Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:43:49 +0000 (14:43 +0000)]

am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '0c8802bb3ee36247f92300a1bed2ead77c436479':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:43:43 +0000 (14:43 +0000)]

am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE

* commit 'b6a5dab3ed29c9c9bc864abff0e534641dcd4f32':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:39:47 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:36:56 +0000 (14:36 +0000)]

am feb6c7f3: (-s ours) Import translations. DO NOT MERGE

* commit 'feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:28:48 +0000 (06:28 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ifbbb87b8df40d269d7e28aa398dcacc878c93011
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:25:08 +0000 (06:25 -0800)]

Import translations. DO NOT MERGE

Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import

commit | commitdiff | tree

Sarah Maddox [Tue, 28 Oct 2014 05:30:24 +0000 (16:30 +1100)]

docs: Updates lesson 1 of location API training: Get last-known location.

Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be

commit | commitdiff | tree

Prem Kumar [Sun, 14 Dec 2014 20:06:28 +0000 (20:06 +0000)]

am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev

* commit 'fa205ffff292bcbc1c504491b7ca2a5ee1b7b547':
make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749

commit | commitdiff | tree

Prem Kumar [Sun, 14 Dec 2014 20:06:22 +0000 (20:06 +0000)]

am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev

* commit 'cb9379ca774a503a9d33f3c0e8c5010495d2af58':
handle beacons reported with wrong RSSI value of 0 - Bug:18654243

commit | commitdiff | tree

Prem Kumar [Sun, 14 Dec 2014 19:59:40 +0000 (19:59 +0000)]

am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev

* commit '9ef07ad2b63edd4094bd8f15ccf861c7b014b2b0':
make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749

commit | commitdiff | tree

Prem Kumar [Sun, 14 Dec 2014 19:59:35 +0000 (19:59 +0000)]

am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev

* commit '6c2fa049aa342ed09c6987302d79a9447b99e5a4':
handle beacons reported with wrong RSSI value of 0 - Bug:18654243

commit | commitdiff | tree

Prem Kumar [Sun, 14 Dec 2014 19:53:47 +0000 (19:53 +0000)]

Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev

commit | commitdiff | tree

Prem Kumar [Sun, 14 Dec 2014 19:52:38 +0000 (19:52 +0000)]

Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev

commit | commitdiff | tree

Guang Zhu [Sun, 14 Dec 2014 04:04:26 +0000 (04:04 +0000)]

am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev

* commit 'd8ca1208b3ee76e45e45e47d5806c398442a55a3':
shell based UI Automator source move

commit | commitdiff | tree

Guang Zhu [Sun, 14 Dec 2014 03:39:07 +0000 (03:39 +0000)]

am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev

* commit '07bba9abeeba77cdf491ecc3047d1fa34f280bbb':
shell based UI Automator source move

commit | commitdiff | tree

Guang Zhu [Sun, 14 Dec 2014 03:30:51 +0000 (03:30 +0000)]

Merge "shell based UI Automator source move" into lmp-mr1-dev

commit | commitdiff | tree

Jinsuk Kim [Sat, 13 Dec 2014 23:53:29 +0000 (23:53 +0000)]

am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev

* commit 'd8858fa91712b5e5d2a832e1993b6e265dafcf39':
audioservice: Clear calling identity upon calling HdmiControlService

commit | commitdiff | tree

Jinsuk Kim [Sat, 13 Dec 2014 23:46:38 +0000 (23:46 +0000)]

am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev

* commit 'a2bc055eeb240c1787e7ad9755ffd4f106bdbb63':
audioservice: Clear calling identity upon calling HdmiControlService

commit | commitdiff | tree

Jinsuk Kim [Sat, 13 Dec 2014 23:41:46 +0000 (23:41 +0000)]

Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev

commit | commitdiff | tree

Rich Slogar [Sat, 13 Dec 2014 06:24:20 +0000 (06:24 +0000)]

am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update

* commit '895d16945e97e108e33c614f87004c3f1efe5cb4':
docs: studio 1.0.1 revision update

commit | commitdiff | tree

Rich Slogar [Sat, 13 Dec 2014 06:17:00 +0000 (06:17 +0000)]

am 6b8756c3: docs: studio 1.0.1 revision update

* commit '6b8756c39764b166c9f7d384e4542960dd8a7f98':
docs: studio 1.0.1 revision update

commit | commitdiff | tree

Rich Slogar [Fri, 12 Dec 2014 22:59:34 +0000 (14:59 -0800)]

docs: studio 1.0.1 revision update

Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124

commit | commitdiff | tree

Guang Zhu [Thu, 11 Dec 2014 23:12:30 +0000 (15:12 -0800)]

shell based UI Automator source move

frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
(samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils

no source files changed, only one line makefile update (for
UI Automator API check)

Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73

commit | commitdiff | tree

smain@google.com [Sat, 13 Dec 2014 01:12:37 +0000 (01:12 +0000)]

am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs

* commit '8bb3962b2e58870efa01b2fc0fd8c2a620414974':
fix distribute nav styles. they were not highlighted correctly.

commit | commitdiff | tree

Christopher Tate [Sat, 13 Dec 2014 01:09:03 +0000 (01:09 +0000)]

am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev

* commit '36ba3e478fbbb664a97b24723836444184c6943f':
Check which file changed before requesting backup

commit | commitdiff | tree

smain@google.com [Sat, 13 Dec 2014 01:04:02 +0000 (01:04 +0000)]

am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs

* commit '8e8f29e34266b49d02f236367be98d6885f2f8a6':
fix distribute nav styles. they were not highlighted correctly.

commit | commitdiff | tree

Christopher Tate [Sat, 13 Dec 2014 00:59:10 +0000 (00:59 +0000)]

am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev

* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
Check which file changed before requesting backup

commit | commitdiff | tree

smain@google.com [Sat, 13 Dec 2014 00:55:30 +0000 (00:55 +0000)]

Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs