OSDN Git Service
Adrian Roos [Thu, 6 Nov 2014 16:31:43 +0000 (16:31 +0000)]
am
b2a6c7b8: am
418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev
* commit '
b2a6c7b83f894922663e7144048264af96239a1e':
Round charging indication to nearest minute
Adrian Roos [Thu, 6 Nov 2014 16:26:12 +0000 (16:26 +0000)]
am
418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev
* commit '
418f4ed077ee0559e7f61b8ea10d53e9784fd631':
Round charging indication to nearest minute
Selim Cinek [Thu, 6 Nov 2014 16:22:54 +0000 (16:22 +0000)]
am
fc22dd58: am
49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev
* commit '
fc22dd58c98ae05705b2800a7eb97174a1bc281c':
Adapted HUN behavior when swiping vertically
Selim Cinek [Thu, 6 Nov 2014 16:22:48 +0000 (16:22 +0000)]
am
8f6719a1: am
140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev
* commit '
8f6719a15d818269fecf3760297004740aa8a0dd':
Fixed a bug where the HUNs were not clickable
Selim Cinek [Thu, 6 Nov 2014 16:22:43 +0000 (16:22 +0000)]
am
832607e4: am
6d7065f5: Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev
* commit '
832607e4480a1fb04955654274681ec982406dee':
Fixed a bug that the notifications were not animating when reset
Adrian Roos [Thu, 6 Nov 2014 16:22:05 +0000 (16:22 +0000)]
Merge "Round charging indication to nearest minute" into lmp-mr1-dev
Selim Cinek [Thu, 6 Nov 2014 16:15:54 +0000 (16:15 +0000)]
am
49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev
* commit '
49af6359e04095fa71162c7658f10cf93c94d341':
Adapted HUN behavior when swiping vertically
Selim Cinek [Thu, 6 Nov 2014 16:15:49 +0000 (16:15 +0000)]
am
140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev
* commit '
140e3f88fbd176530f89b3f5f4a29b2a77b97bac':
Fixed a bug where the HUNs were not clickable
Selim Cinek [Thu, 6 Nov 2014 16:15:43 +0000 (16:15 +0000)]
am
6d7065f5: Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev
* commit '
6d7065f50d1e65707f7decc3f56042f808d5488f':
Fixed a bug that the notifications were not animating when reset
Selim Cinek [Thu, 6 Nov 2014 16:12:58 +0000 (16:12 +0000)]
Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev
Selim Cinek [Thu, 6 Nov 2014 16:12:47 +0000 (16:12 +0000)]
Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev
Selim Cinek [Thu, 6 Nov 2014 16:12:00 +0000 (16:12 +0000)]
Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev
Nicolas Prevot [Thu, 6 Nov 2014 15:20:57 +0000 (15:20 +0000)]
am
ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge:
b9744c1
* commit '
ea728d75ebb228822690365d147fc4021fb87ce9':
Add a cross-profile intent filter only if it wasn't previously added.
Yuncheol Heo [Thu, 6 Nov 2014 15:20:51 +0000 (15:20 +0000)]
am
9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge:
0361147
* commit '
9188df6ef00a05fc15f2acf290e40c389ec7c847':
CEC: Allow no parameters with <System Audio Mode Request>.
Nicolas Prevot [Thu, 6 Nov 2014 10:22:13 +0000 (10:22 +0000)]
Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev
automerge:
b9744c1
* commit '
b9744c1c1f5e8cc936da7f1832665f77ad5bb18f':
Add a cross-profile intent filter only if it wasn't previously added.
Yuncheol Heo [Thu, 6 Nov 2014 10:21:09 +0000 (10:21 +0000)]
CEC: Allow no parameters with <System Audio Mode Request>.
automerge:
0361147
* commit '
03611473bc1d13f8e55ac92e37a9716c2fd8e412':
CEC: Allow no parameters with <System Audio Mode Request>.
Nicolas Prevot [Thu, 6 Nov 2014 09:42:44 +0000 (09:42 +0000)]
Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev
Yuncheol Heo [Thu, 6 Nov 2014 08:21:04 +0000 (17:21 +0900)]
CEC: Allow no parameters with <System Audio Mode Request>.
Bug:
18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
Sailesh Nepal [Thu, 6 Nov 2014 06:21:56 +0000 (06:21 +0000)]
am
8fafe7b4: am
db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev
* commit '
8fafe7b454c27e1ba2850c04e8ef4e16795e13fb':
Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
Sailesh Nepal [Thu, 6 Nov 2014 06:17:54 +0000 (06:17 +0000)]
am
db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev
* commit '
db66e1d2b9b63eb1612820dc6572de1e42880646':
Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
Sailesh Nepal [Thu, 6 Nov 2014 06:14:14 +0000 (06:14 +0000)]
Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev
Yuncheol Heo [Thu, 6 Nov 2014 05:58:53 +0000 (05:58 +0000)]
am
d87c32aa: am
ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev
* commit '
d87c32aa859ef54c6bce923c52725edf44538488':
CEC: Don't send <Feature Abort> on the short message
Yuncheol Heo [Thu, 6 Nov 2014 05:53:31 +0000 (05:53 +0000)]
am
ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev
* commit '
ff636d383c8f0464e543866ae73ec4a367efd15a':
CEC: Don't send <Feature Abort> on the short message
Yuncheol Heo [Thu, 6 Nov 2014 05:47:48 +0000 (05:47 +0000)]
Merge "CEC: Don't send <Feature Abort> on the short message" into lmp-mr1-dev
Sailesh Nepal [Thu, 6 Nov 2014 02:37:53 +0000 (18:37 -0800)]
Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
This CL adds a new disconnect cause. Connection managers
can specify this disconnect cause when it doesn't want
to route calls.
Bug:
16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
Jim Miller [Thu, 6 Nov 2014 03:07:09 +0000 (03:07 +0000)]
am
6230cdf5: am
262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
* commit '
6230cdf5721f11660e2c0fec1c5695346a9001d0':
Update TrustAgentService API after review
Jim Miller [Thu, 6 Nov 2014 02:57:39 +0000 (02:57 +0000)]
am
262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
* commit '
262dc4dafede871712d89f35d630ab2a332ee6cb':
Update TrustAgentService API after review
mike dooley [Thu, 6 Nov 2014 02:55:28 +0000 (02:55 +0000)]
am
6b93e2b0: am
8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev
* commit '
6b93e2b02620034e79cb3bdf6d543c3f96abadd7':
Adding method to get disconnect cause from conference
Jim Miller [Thu, 6 Nov 2014 02:52:19 +0000 (02:52 +0000)]
Merge "Update TrustAgentService API after review" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:49:08 +0000 (02:49 +0000)]
am
e7f66ada: am
fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '
e7f66ada24c2b4098e9fea1c07d570543149c806':
Add missing secure stop methods
mike dooley [Thu, 6 Nov 2014 02:48:58 +0000 (02:48 +0000)]
am
8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev
* commit '
8355c500ea6f809ef2e6885aee673d39f1cb223b':
Adding method to get disconnect cause from conference
mike dooley [Thu, 6 Nov 2014 02:43:59 +0000 (02:43 +0000)]
Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:39:11 +0000 (02:39 +0000)]
am
fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '
fc4e6f70f64676ab375c3e233b6c07e3bc56cb64':
Add missing secure stop methods
Jeff Tinker [Thu, 6 Nov 2014 02:33:22 +0000 (02:33 +0000)]
Merge "Add missing secure stop methods" into lmp-mr1-dev
Yuncheol Heo [Wed, 5 Nov 2014 23:25:39 +0000 (08:25 +0900)]
CEC: Don't send <Feature Abort> on the short message
Bug:
18261915
Change-Id: I722392afacc29ec9f2af27df49b68bd773b53e3d
Jim Miller [Wed, 27 Aug 2014 00:12:29 +0000 (17:12 -0700)]
Update TrustAgentService API after review
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.
It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.
Fixes bug
17008504
Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
Jeff Davidson [Thu, 6 Nov 2014 01:48:45 +0000 (01:48 +0000)]
am
63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge:
24f535b
* commit '
63226dd8f3570bd3b28e4241668843385ba99c2d':
Allow apps with SCORE_NETWORKS to set the active scorer.
Jeff Davidson [Thu, 6 Nov 2014 01:32:55 +0000 (01:32 +0000)]
Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev
automerge:
24f535b
* commit '
24f535b87341b8729d6d4235acc51f0e87916d3a':
Allow apps with SCORE_NETWORKS to set the active scorer.
Jeff Davidson [Thu, 6 Nov 2014 01:25:03 +0000 (01:25 +0000)]
Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev
Robert Greenwalt [Wed, 5 Nov 2014 23:45:03 +0000 (23:45 +0000)]
am
a4f34edd: am
7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
* commit '
a4f34eddb3b46a81ce90a9eded54b35b62e40337':
Fix Legacy typing of net-specific requests.
Robert Greenwalt [Wed, 5 Nov 2014 23:40:35 +0000 (23:40 +0000)]
am
7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
* commit '
7efdb83ceeea3dc916f8a05f59f7b35cb8d13597':
Fix Legacy typing of net-specific requests.
Robert Greenwalt [Wed, 5 Nov 2014 23:36:00 +0000 (23:36 +0000)]
Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
Jeff Davidson [Wed, 5 Nov 2014 23:19:44 +0000 (23:19 +0000)]
am
8cae7f64: am
8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev
* commit '
8cae7f644c59f0200f1962abdfbc6001166a192c':
Fix incorrect doc for WifiInfo#getSSID().
George Mount [Wed, 5 Nov 2014 23:15:00 +0000 (23:15 +0000)]
am
aa627037: am
c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev
* commit '
aa6270375263ebf6da4f2f0de31df808eb278563':
Cancel animation when target changes.
Jeff Davidson [Wed, 5 Nov 2014 23:14:26 +0000 (23:14 +0000)]
am
8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev
* commit '
8fe7676ee80019b3efc3369f9c9d9631047d58ef':
Fix incorrect doc for WifiInfo#getSSID().
Jeff Davidson [Wed, 5 Nov 2014 23:10:57 +0000 (23:10 +0000)]
Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev
George Mount [Wed, 5 Nov 2014 23:08:24 +0000 (23:08 +0000)]
am
c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev
* commit '
c838b677749e0c20fc201b0418864be3835711b8':
Cancel animation when target changes.
Robert Greenwalt [Wed, 29 Oct 2014 21:04:06 +0000 (14:04 -0700)]
Fix Legacy typing of net-specific requests.
We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not. Only compare the things we care
about.
bug:
18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
George Mount [Wed, 5 Nov 2014 23:04:17 +0000 (23:04 +0000)]
Merge "Cancel animation when target changes." into lmp-mr1-dev
Rob Tsuk [Wed, 5 Nov 2014 22:31:05 +0000 (22:31 +0000)]
am
db6a1358: am
6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev
* commit '
db6a1358d45430a952aa746f8dfd452d12d7e4be':
Log shader source when it fails to compile
Rob Tsuk [Wed, 5 Nov 2014 22:26:11 +0000 (22:26 +0000)]
am
6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev
* commit '
6c96cbf581bf97b034e4c65eabe3c0fe8d930bfa':
Log shader source when it fails to compile
Jeff Davidson [Wed, 5 Nov 2014 19:14:19 +0000 (11:14 -0800)]
Allow apps with SCORE_NETWORKS to set the active scorer.
This allows for a more streamlined UX in the current world, where
scorer apps are trusted (by virtue of being in /system/priv-app).
Trusted apps can continue to use the system dialog for consent, but
they may also set the scorer directly, under the assumption that they
are using their own consent UX to explain the feature to the user.
Bug:
16577529
Change-Id: I2a6edb7f1f688aaacf9b0152fa1da1a88636c3dc
Rob Tsuk [Wed, 5 Nov 2014 22:22:51 +0000 (22:22 +0000)]
Merge "Log shader source when it fails to compile" into lmp-mr1-dev
Eric Laurent [Wed, 5 Nov 2014 22:10:20 +0000 (22:10 +0000)]
am
29218f24: am
e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev
* commit '
29218f24719490e26ba41db2875d54853866e39f':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Wed, 5 Nov 2014 22:06:23 +0000 (22:06 +0000)]
am
e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev
* commit '
e43bf0821b41b135892001ad89518eb08d67bcd4':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Wed, 5 Nov 2014 22:02:52 +0000 (22:02 +0000)]
Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 22:01:24 +0000 (22:01 +0000)]
am
f97f8304: am
cdb72e23: am
c2a0d9e5: am
66c46c4a: am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
f97f83046745bfc988f2fc5b6549e7c93ffd35c9':
Docs: Fix typo in Preference android:order attribute.
John Spurlock [Wed, 5 Nov 2014 21:55:40 +0000 (21:55 +0000)]
am
cdb72e23: am
c2a0d9e5: am
66c46c4a: am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
cdb72e2392e76da341496d073c601d04b030c990':
Docs: Fix typo in Preference android:order attribute.
Winson Chung [Wed, 5 Nov 2014 21:51:38 +0000 (21:51 +0000)]
am
5284dd8d: am
91283969: Merge "Fixing crash in recents window transition. (Bug
18246975,
18159006)" into lmp-mr1-dev
* commit '
5284dd8d6933156ee785d3270754cc6671252625':
Fixing crash in recents window transition. (Bug
18246975,
18159006)
John Spurlock [Wed, 5 Nov 2014 21:47:32 +0000 (21:47 +0000)]
am
c2a0d9e5: am
66c46c4a: am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
c2a0d9e54e778338d73c99598dc741eebd58a326':
Docs: Fix typo in Preference android:order attribute.
Jeff Davidson [Wed, 5 Nov 2014 21:43:10 +0000 (21:43 +0000)]
am
dd40ccf3: am
b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev
* commit '
dd40ccf36203c740aea3849f54495d1287d02b2b':
Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
Winson Chung [Wed, 5 Nov 2014 21:42:38 +0000 (21:42 +0000)]
am
91283969: Merge "Fixing crash in recents window transition. (Bug
18246975,
18159006)" into lmp-mr1-dev
* commit '
9128396982233d6af49613231100f1bc4b6c477b':
Fixing crash in recents window transition. (Bug
18246975,
18159006)
John Spurlock [Wed, 5 Nov 2014 21:40:46 +0000 (21:40 +0000)]
am
66c46c4a: am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
66c46c4a9289a8e21c8f36fe06679be5f6534841':
Docs: Fix typo in Preference android:order attribute.
Winson Chung [Wed, 5 Nov 2014 21:39:15 +0000 (21:39 +0000)]
Merge "Fixing crash in recents window transition. (Bug
18246975,
18159006)" into lmp-mr1-dev
Jeff Davidson [Wed, 5 Nov 2014 21:37:34 +0000 (21:37 +0000)]
am
b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev
* commit '
b42bdef51c5a4de44333ad268f25df1aac5ab880':
Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
John Spurlock [Wed, 5 Nov 2014 21:36:13 +0000 (21:36 +0000)]
am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
Docs: Fix typo in Preference android:order attribute.
Jeff Davidson [Wed, 5 Nov 2014 21:33:14 +0000 (21:33 +0000)]
Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev
Rob Tsuk [Wed, 5 Nov 2014 21:26:19 +0000 (13:26 -0800)]
Log shader source when it fails to compile
So that there will be something to diagnose when such failures occur during
stability tests.
Bug:
18092655
Change-Id: I9a9d8d33b34273a477f2a9dbcf092887dcbc91c0
John Spurlock [Wed, 5 Nov 2014 21:17:50 +0000 (16:17 -0500)]
Docs: Fix typo in Preference android:order attribute.
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
Rich Slogar [Wed, 5 Nov 2014 21:02:46 +0000 (21:02 +0000)]
am
aaafc8ec: am
faac8b79: am
c3d174a0: am
848d9125: am
1afa82dc: docs:remove sdk/ndk note
* commit '
aaafc8ec6701338246ec945bf861fec8ff56a832':
docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:56:49 +0000 (20:56 +0000)]
am
faac8b79: am
c3d174a0: am
848d9125: am
1afa82dc: docs:remove sdk/ndk note
* commit '
faac8b798359a6065a509dc0b127e887fed5d8a4':
docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:50:03 +0000 (20:50 +0000)]
am
c3d174a0: am
848d9125: am
1afa82dc: docs:remove sdk/ndk note
* commit '
c3d174a0304d3be57e485c48783d7c101553c78a':
docs:remove sdk/ndk note
Sanket Padawe [Wed, 5 Nov 2014 20:44:23 +0000 (20:44 +0000)]
am
4960a5bb: Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev automerge:
d12b695
* commit '
4960a5bb0c93aa49c4303e6e9d30139a4a2e9620':
Changes related to setting default color for sim in multisim.
Andrew Solovay [Wed, 5 Nov 2014 20:44:07 +0000 (20:44 +0000)]
am
4f0850a1: am
fbc3bdec: am
56576838: am
d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge:
8d7d7b4
* commit '
4f0850a138f02a9bda405f987a0623fa84da2615':
docs: Removed broken link to non-existent method.
Ricardo Cervera [Wed, 5 Nov 2014 20:44:02 +0000 (20:44 +0000)]
am
1ea25753: am
5a57ec02: am
b4125d1e: am
58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs automerge:
b2f0f35
* commit '
1ea25753505b5814585a9abbfca6a6113bccc228':
docs: Add instructions to attach debugger to a running process.
John Spurlock [Wed, 5 Nov 2014 20:43:18 +0000 (20:43 +0000)]
am
6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge:
2f9e7f6
* commit '
6ccb72e9940df9b50a213fa84483ed5da9780cd0':
Zen: Add the ability to enter "None" mode during downtime.
Sanket Padawe [Wed, 5 Nov 2014 20:33:37 +0000 (20:33 +0000)]
Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev
automerge:
d12b695
* commit '
d12b69518daabff3c13482f4b5140020b747b71f':
Changes related to setting default color for sim in multisim.
Adam Lesinski [Wed, 5 Nov 2014 20:31:19 +0000 (20:31 +0000)]
Merge "Merge commit '
fb96e54' into manualmerge" into lmp-mr1-dev-plus-aosp
Sanket Padawe [Wed, 5 Nov 2014 20:30:28 +0000 (20:30 +0000)]
Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev
Adam Lesinski [Wed, 5 Nov 2014 20:30:25 +0000 (12:30 -0800)]
Merge commit '
fb96e54' into manualmerge
Conflicts:
tools/aapt/Resource.cpp
Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
Andrew Solovay [Wed, 5 Nov 2014 20:26:24 +0000 (20:26 +0000)]
am
fbc3bdec: am
56576838: am
d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge:
8d7d7b4
* commit '
fbc3bdec7a2a80e8c3f1cdfebaecc6dba82c9cc6':
docs: Removed broken link to non-existent method.
Ricardo Cervera [Wed, 5 Nov 2014 20:26:20 +0000 (20:26 +0000)]
am
5a57ec02: am
b4125d1e: am
58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs automerge:
b2f0f35
* commit '
5a57ec024ffb14bbbf8dfdd5215b4a08c33ea97d':
docs: Add instructions to attach debugger to a running process.
Andrew Solovay [Wed, 5 Nov 2014 20:22:24 +0000 (20:22 +0000)]
am
56576838: am
d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
automerge:
8d7d7b4
* commit '
8d7d7b448f2df7e4fdff6a3ca890b32b83075ead':
docs: Removed broken link to non-existent method.
Ricardo Cervera [Wed, 5 Nov 2014 20:21:03 +0000 (20:21 +0000)]
am
b4125d1e: am
58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
automerge:
b2f0f35
* commit '
b2f0f3514c20b478655e4c3f192a98cfea2335ce':
docs: Add instructions to attach debugger to a running process.
Eric Laurent [Wed, 5 Nov 2014 20:18:05 +0000 (12:18 -0800)]
AudioEffect JNI: use new max preprocessing constant
Bug:
18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
Rich Slogar [Wed, 5 Nov 2014 20:17:55 +0000 (20:17 +0000)]
am
848d9125: am
1afa82dc: docs:remove sdk/ndk note
* commit '
848d912505079cc3cbd362a4333f0eabfac3c1c5':
docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:13:35 +0000 (20:13 +0000)]
am
1afa82dc: docs:remove sdk/ndk note
* commit '
1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
docs:remove sdk/ndk note
Dan Albert [Wed, 5 Nov 2014 20:11:53 +0000 (20:11 +0000)]
am
59701b9b: resolved conflicts for merge of
97014933 to stage-aosp-master
* commit '
59701b9ba5c453e327bc0e6873a9f6ff87a10391':
Fix a wonderful copy/paste time bomb.
Craig Mautner [Wed, 5 Nov 2014 20:01:56 +0000 (20:01 +0000)]
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge:
3f36ba6
automerge:
a72b222
* commit '
a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c':
When keyguard exits use same anim for all windows
Paul Jensen [Wed, 5 Nov 2014 20:00:46 +0000 (20:00 +0000)]
am
021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
automerge:
6ad91cb
* commit '
6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Dan Sandler [Wed, 5 Nov 2014 19:59:19 +0000 (19:59 +0000)]
am
ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev
automerge:
125fb86
* commit '
125fb86ee0cc0e49d6847bed7a76829ad87c1312':
Materialize default app icon.
John Spurlock [Wed, 5 Nov 2014 19:32:54 +0000 (19:32 +0000)]
Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev
automerge:
2f9e7f6
* commit '
2f9e7f6d8b6716f0fcc7db9ef797667ebda8a813':
Zen: Add the ability to enter "None" mode during downtime.
Adam Lesinski [Wed, 5 Nov 2014 19:31:22 +0000 (19:31 +0000)]
Merge "Add error checking to aapt for split generation" into lmp-mr1-dev
automerge:
69ecfa9
* commit '
69ecfa903492b502b7b1636345e050b57313c251':
Add error checking to aapt for split generation
Craig Mautner [Wed, 5 Nov 2014 19:30:19 +0000 (19:30 +0000)]
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
automerge:
3f36ba6
* commit '
3f36ba647d6bd49363ea9f025a8b1aeac0abeddd':
When keyguard exits use same anim for all windows
Dan Albert [Wed, 5 Nov 2014 19:29:34 +0000 (11:29 -0800)]
resolved conflicts for merge of
97014933 to stage-aosp-master
Change-Id: I078368a7452b8cdc67f299985c60eef90f144367
John Spurlock [Wed, 5 Nov 2014 19:17:20 +0000 (19:17 +0000)]
Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev
Adam Lesinski [Wed, 5 Nov 2014 19:15:55 +0000 (19:15 +0000)]
Merge "Add error checking to aapt for split generation" into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 14:13:30 +0000 (09:13 -0500)]
Zen: Add the ability to enter "None" mode during downtime.
Updates to the shared config structure and the service backend.
Bug:
16373455
Change-Id: I45761690ba6b32eb81c9e2a5c1f2d4adad93e58d
Paul Jensen [Wed, 5 Nov 2014 19:11:32 +0000 (19:11 +0000)]
am
021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
* commit '
021a95f761e1bc26cc215a9daedb04af818002f5':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Craig Mautner [Wed, 5 Nov 2014 19:07:59 +0000 (19:07 +0000)]
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
OSDN Git Service
