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

(root) / android-x86 / frameworks-base.git / log

Geoff Mendal [Wed, 17 Dec 2014 16:31:49 +0000 (16:31 +0000)]

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

* commit '2e2fd473be7a8ebb6392643812eb9119c402cbbb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 16:25:12 +0000 (16:25 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 15:39:09 +0000 (07:39 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 15:33:28 +0000 (15:33 +0000)]

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

* commit '13f57b848c99a9dc3535a13059d50e421a9f6697':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 15:28:03 +0000 (15:28 +0000)]

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

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

commit | commitdiff | tree

Christoph Studer [Wed, 17 Dec 2014 15:23:48 +0000 (15:23 +0000)]

am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev

* commit '1464dd2f925f4b6179a7ede287f13431e6835aec':
Notification: Fix bigLargeIcon

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 15:22:28 +0000 (15:22 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 15:18:42 +0000 (07:18 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Christoph Studer [Wed, 17 Dec 2014 15:18:31 +0000 (15:18 +0000)]

am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev

* commit '0b22e395d24cba14d4113fb326bfcb57c6aa5996':
Notification: Fix bigLargeIcon

commit | commitdiff | tree

Christoph Studer [Wed, 17 Dec 2014 15:14:00 +0000 (15:14 +0000)]

Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 14:57:55 +0000 (14:57 +0000)]

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

* commit '6641a0b5a21c55d1a69cf19393380517ae2a1e95':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 14:57:50 +0000 (14:57 +0000)]

am 63383c96: (-s ours) am 8f0d3694: (-s ours) Import translations. DO NOT MERGE

* commit '63383c96a4766182b79412acb7642c4a38c357e6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 14:53:37 +0000 (14:53 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 14:51:23 +0000 (14:51 +0000)]

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

* commit '8f0d3694f667263df6bed7b1c89df3911145437c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 14:50:55 +0000 (06:50 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 14:44:29 +0000 (06:44 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Paul Jensen [Wed, 17 Dec 2014 13:05:39 +0000 (13:05 +0000)]

am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev

* commit '24594794cbb9bf6bb9c8b57e4427c88efee82304':
Fix race between CONNECTIVITY_ACTION and setting default network.

commit | commitdiff | tree

Paul Jensen [Wed, 17 Dec 2014 12:59:29 +0000 (12:59 +0000)]

am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev

* commit 'b0575a24df6bc840d720dafa6e737cdd61fb2c6f':
Fix race between CONNECTIVITY_ACTION and setting default network.

commit | commitdiff | tree

Paul Jensen [Wed, 17 Dec 2014 12:54:13 +0000 (12:54 +0000)]

Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev

commit | commitdiff | tree

Yorke Lee [Wed, 17 Dec 2014 00:38:58 +0000 (00:38 +0000)]

am 50d8e5b0: am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev

* commit '50d8e5b0c067a532f893889ce58125233a12f7fc':
Revert "Allow home to be pressed while in incoming call screen"

commit | commitdiff | tree

Yorke Lee [Wed, 17 Dec 2014 00:30:26 +0000 (00:30 +0000)]

am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev

* commit 'd3836e9df4ee0b22dd115e96abe976730263129d':
Revert "Allow home to be pressed while in incoming call screen"

commit | commitdiff | tree

Yorke Lee [Wed, 17 Dec 2014 00:16:58 +0000 (00:16 +0000)]

Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev

commit | commitdiff | tree

Nancy Chen [Tue, 16 Dec 2014 23:19:25 +0000 (23:19 +0000)]

am 799ff2ea: am ab4f36c0: Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev

* commit '799ff2ea099bdedf5b93630c2ab3cc362f022e70':
Pass onPostDialChar call back from Telephony to Telecom.

commit | commitdiff | tree

Nancy Chen [Tue, 16 Dec 2014 23:10:45 +0000 (23:10 +0000)]

am ab4f36c0: Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev

* commit 'ab4f36c0df73bbe583a16eaa960401fd3f9c0db8':
Pass onPostDialChar call back from Telephony to Telecom.

commit | commitdiff | tree

Nancy Chen [Tue, 16 Dec 2014 23:06:27 +0000 (23:06 +0000)]

Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 21:43:02 +0000 (21:43 +0000)]

Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 21:42:54 +0000 (21:42 +0000)]

am 68a81bd8: am 8de16999: Merge "Fix typo with register native allocation."

* commit '68a81bd8817e997cace3bedf8a013d2cdaff9daa':
Fix typo with register native allocation.

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 21:42:18 +0000 (21:42 +0000)]

am fac7bfd6: am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev

* commit 'fac7bfd6e4e6d8484b93afabc7fbd31968693a64':
Fix typo with register native allocation.

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 21:36:43 +0000 (21:36 +0000)]

am 8de16999: Merge "Fix typo with register native allocation."

* commit '8de169993f0078bfdd064499c48b9d124cb438be':
Fix typo with register native allocation.

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 21:36:37 +0000 (21:36 +0000)]

am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev

* commit '6c02facd83f1fa1ebf11d9cfda9872232c2d2d15':
Fix typo with register native allocation.

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 21:33:01 +0000 (21:33 +0000)]

Merge "Fix typo with register native allocation." into lmp-mr1-dev

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 21:30:57 +0000 (21:30 +0000)]

Merge "Fix typo with register native allocation."

commit | commitdiff | tree

Christopher Tate [Tue, 16 Dec 2014 21:13:25 +0000 (21:13 +0000)]

am 892e65cb: am 0dab4dc0: Fix bad alarm delivery

* commit '892e65cb2ac4b4917b41060300bbaa3414233394':
Fix bad alarm delivery

commit | commitdiff | tree

Christopher Tate [Tue, 16 Dec 2014 21:07:54 +0000 (21:07 +0000)]

am 0dab4dc0: Fix bad alarm delivery

* commit '0dab4dc03d1daae72bba9d364e15f6055cb339fd':
Fix bad alarm delivery

commit | commitdiff | tree

Ying Wang [Tue, 16 Dec 2014 20:57:35 +0000 (20:57 +0000)]

am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
Cleanup Obsolete LOCAL_PRELINK_MODULE.

commit | commitdiff | tree

Christopher Tate [Tue, 16 Dec 2014 20:14:06 +0000 (12:14 -0800)]

Fix bad alarm delivery

The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0. That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed. For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

(Cherrypick of 5c3e277fb42bd799287936c5aee0d30fbcc7e65c from its
original branch.)

Change-Id: Ib9c3200f7e6bc6fa0c9928ee9db4cfd87f039353

commit | commitdiff | tree

Nancy Chen [Tue, 16 Dec 2014 00:12:50 +0000 (16:12 -0800)]

Pass onPostDialChar call back from Telephony to Telecom.

Add plumbing to alert Telecom every time a character is processed after
the post dial wait state (the processing happens in Telephony).

Bug: 18644688
Change-Id: I487d76aa9c959ca528c6377374aa35c2d0b4a803

commit | commitdiff | tree

Ying Wang [Tue, 16 Dec 2014 20:50:58 +0000 (20:50 +0000)]

am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

* commit 'c80c12dda9c1ce11affdccb2923b2e570daacfcd':
Cleanup Obsolete LOCAL_PRELINK_MODULE.

commit | commitdiff | tree

Ying Wang [Tue, 16 Dec 2014 20:46:17 +0000 (20:46 +0000)]

Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

commit | commitdiff | tree

Ying Wang [Tue, 16 Dec 2014 20:43:40 +0000 (12:43 -0800)]

Cleanup Obsolete LOCAL_PRELINK_MODULE.

Bug: 18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc

commit | commitdiff | tree

Christopher Tate [Tue, 16 Dec 2014 20:34:37 +0000 (20:34 +0000)]

am 15626d3a: am b32a33ce: Merge "Turn debug flag off"

* commit '15626d3a493b5eb4c1fecb73f8d4fc18547c4c13':
Turn debug flag off

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 16 Dec 2014 19:37:15 +0000 (19:37 +0000)]

am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev

* commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7':
IMS OMA-DM Intent and ImsReasonInfo Additions

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 16 Dec 2014 19:32:24 +0000 (19:32 +0000)]

am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev

* commit 'ec3f46a5ec961e7f41d1e0d40e97806e9767bfb3':
IMS OMA-DM Intent and ImsReasonInfo Additions

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 16 Dec 2014 19:27:35 +0000 (19:27 +0000)]

Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev

commit | commitdiff | tree

Christoph Studer [Tue, 16 Dec 2014 18:31:53 +0000 (18:31 +0000)]

am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev

* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
Fix MediaStyle docs mentioning 2 max actions in compact view

commit | commitdiff | tree

Christoph Studer [Tue, 16 Dec 2014 18:26:26 +0000 (18:26 +0000)]

am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev

* commit '0bb83b07d1602c1a99c938471edfc411a47dbffc':
Fix MediaStyle docs mentioning 2 max actions in compact view

commit | commitdiff | tree

Christoph Studer [Tue, 16 Dec 2014 18:16:40 +0000 (18:16 +0000)]

Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 17:59:09 +0000 (09:59 -0800)]

Fix typo with register native allocation.

bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808

commit | commitdiff | tree

Adam Powell [Tue, 16 Dec 2014 18:13:01 +0000 (18:13 +0000)]

am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev

* commit '91ff85da1a2a106c8ddb5e204928e0d6ef094283':
Fix touch intercept bug in ResolverDrawerLayout

commit | commitdiff | tree

Adam Powell [Tue, 16 Dec 2014 18:08:34 +0000 (18:08 +0000)]

am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev

* commit '67af29f6d642c3c578ee1b5af70dc525955982a5':
Fix touch intercept bug in ResolverDrawerLayout

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Dec 2014 18:02:09 +0000 (18:02 +0000)]

am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

* commit '503a4494d64d30f9b904b24a56fff986810da610':
AAPT: Copy android:revisionCode to Splits

commit | commitdiff | tree

Adam Powell [Tue, 16 Dec 2014 18:01:02 +0000 (18:01 +0000)]

Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev

commit | commitdiff | tree

Tim Murray [Tue, 16 Dec 2014 17:59:09 +0000 (09:59 -0800)]

Fix typo with register native allocation.

bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Dec 2014 17:57:07 +0000 (17:57 +0000)]

am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

* commit 'f1f179a765b6969ba51574d4a10b0381acb0f945':
AAPT: Copy android:revisionCode to Splits

commit | commitdiff | tree

ztenghui [Tue, 16 Dec 2014 17:56:51 +0000 (17:56 +0000)]

am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev

* commit '84c7ef8a28d321e190d4d3f9a0c91ee5ae41bf9a':
Remove 2 sub-tests from the internal test app.

commit | commitdiff | tree

ztenghui [Tue, 16 Dec 2014 17:51:54 +0000 (17:51 +0000)]

am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev

* commit 'd8ce65c9b5142ff9aeadb4caecd46a4811021d7b':
Remove 2 sub-tests from the internal test app.

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Dec 2014 17:50:02 +0000 (17:50 +0000)]

Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

commit | commitdiff | tree

Omkar Kolangade [Thu, 4 Dec 2014 02:35:10 +0000 (18:35 -0800)]

IMS OMA-DM Intent and ImsReasonInfo Additions

Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4

commit | commitdiff | tree

ztenghui [Tue, 16 Dec 2014 17:45:00 +0000 (17:45 +0000)]

Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev

commit | commitdiff | tree

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

Adam Lesinski [Tue, 16 Dec 2014 17:16:26 +0000 (09:16 -0800)]

AAPT: Copy android:revisionCode to Splits

Bug:18706179
Change-Id: I669b56e0b67dd1bfda7749ef433b55af16851154

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

Christopher Tate [Tue, 16 Dec 2014 03:03:11 +0000 (03:03 +0000)]

am b32a33ce: Merge "Turn debug flag off"

* commit 'b32a33cec1bf54ba3fc243c1fbab59a98506c0ef':
Turn debug flag off

commit | commitdiff | tree

Christopher Tate [Tue, 16 Dec 2014 02:53:13 +0000 (02:53 +0000)]

Merge "Turn debug flag off"

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

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help