OSDN Git Service
RoboErik [Thu, 17 Jul 2014 19:53:23 +0000 (19:53 +0000)]
am
4e8b237d: Merge "return false for media keys if no controller" into lmp-dev
* commit '
4e8b237d6a97b7c97fded14005723e56c9bb8c19':
return false for media keys if no controller
Eino-Ville Talvala [Thu, 17 Jul 2014 19:37:57 +0000 (19:37 +0000)]
am
97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
* commit '
97bc653093792eb0efb9581d1885e55ccbd0bad9':
Add PackageManager features for differentiating camera2 devices
Winson Chung [Thu, 17 Jul 2014 19:37:51 +0000 (19:37 +0000)]
am
3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug
16372369)" into lmp-dev
* commit '
3bf3d3c0a283f086f605b1d9497755d854dc852d':
Fixing optimization in Task loading. (Bug
16372369)
Chris Craik [Thu, 17 Jul 2014 19:37:46 +0000 (19:37 +0000)]
am
8ca30207: Merge "Minor cleanups around color usage" into lmp-dev
* commit '
8ca3020778727ad35f305fb84611c1e43c3c8a92':
Minor cleanups around color usage
Chris Craik [Thu, 17 Jul 2014 19:33:15 +0000 (19:33 +0000)]
am
19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev
* commit '
19f0c01cdfae327487497bcc3c2b9e2b2ab628a2':
Simplify ViewRootImpl's AttachInfo usage
Amith Yamasani [Thu, 17 Jul 2014 19:21:49 +0000 (19:21 +0000)]
am
56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
* commit '
56e7c4ef6277c573be0f9b1409f875286b79b671':
Split telephony restrictions into outgoing calls and sms
Adam Powell [Thu, 17 Jul 2014 18:57:22 +0000 (18:57 +0000)]
am
21b1b8b9: Add nested pre-fling for nested scrolling
* commit '
21b1b8b9a17d8e32d193a14ec4507448f2f3e20b':
Add nested pre-fling for nested scrolling
Adam Powell [Thu, 17 Jul 2014 04:41:31 +0000 (21:41 -0700)]
Add nested pre-fling for nested scrolling
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.
Bug
15538504
Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
Joe Fernandez [Thu, 17 Jul 2014 18:20:00 +0000 (18:20 +0000)]
am
aafe9d65: am
64ae9303: am
e1e81a9e: am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
aafe9d65f6c2bc350e2a6c5ab3fe7e2b52d53e2a':
docs: Update ADT-1 page with supported apps
John Reck [Thu, 17 Jul 2014 18:19:38 +0000 (18:19 +0000)]
am
bce422bd: Merge "Fix logging" into lmp-dev
* commit '
bce422bd8ed6cab40593e2d4b9ccc4fd316b5d47':
Fix logging
Ruben Brunk [Thu, 17 Jul 2014 18:19:35 +0000 (18:19 +0000)]
am
0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev
* commit '
0a749af3a914a795f7cebdbdcb4c29372925e66a':
camera2: Fix swapped Face detection commands.
Joe Fernandez [Thu, 17 Jul 2014 18:16:10 +0000 (18:16 +0000)]
am
64ae9303: am
e1e81a9e: am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
64ae930359619f2a49c8a4bef5dc45261c772d45':
docs: Update ADT-1 page with supported apps
Jeff Sharkey [Thu, 17 Jul 2014 18:15:33 +0000 (18:15 +0000)]
am
375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev
* commit '
375d5b90cf59ae201d5aeddca7fe06761f67e642':
Support cluster-style installs for bundled apps.
Ruben Brunk [Thu, 17 Jul 2014 18:12:08 +0000 (18:12 +0000)]
Merge "camera2: Fix swapped Face detection commands." into lmp-dev
Sandeep Siddhartha [Thu, 17 Jul 2014 18:10:15 +0000 (18:10 +0000)]
am
4b360037: Support model deletion
* commit '
4b3600378bf33874eab953c08e353caabff7aee9':
Support model deletion
Craig Mautner [Thu, 17 Jul 2014 18:10:03 +0000 (18:10 +0000)]
am
c2d339a6: Merge "resolved conflicts for merge of
0a931069 to lmp-dev" into lmp-dev
* commit '
c2d339a630acfa2a19aa82f650a7c56f0da8e184':
Additional cleanup after stack deletion.
Adrian Roos [Thu, 17 Jul 2014 18:09:59 +0000 (18:09 +0000)]
am
26f08cdc: Merge "QS Guest fixes" into lmp-dev
* commit '
26f08cdc82a6534b3acb4eef81c205ab6764bd96':
QS Guest fixes
Christopher Tate [Thu, 17 Jul 2014 18:09:55 +0000 (18:09 +0000)]
am
e78826f6: Add BackupAgent.onRestoreFinished() callback
* commit '
e78826f6bcb3c832fe2e732e60b18ce62202f840':
Add BackupAgent.onRestoreFinished() callback
ztenghui [Thu, 17 Jul 2014 18:09:52 +0000 (18:09 +0000)]
am
e1bc5ddb: Add the RTL support to VectorDrawable.
* commit '
e1bc5ddb5e67e61ee8fe144e5983f98d56c135a0':
Add the RTL support to VectorDrawable.
John Reck [Thu, 17 Jul 2014 18:09:48 +0000 (18:09 +0000)]
am
47751fe1: Revert "Separate Canvas JNI code from the implementation."
* commit '
47751fe100923c459b17eb017be3b7fc6c7efc5e':
Revert "Separate Canvas JNI code from the implementation."
Winson Chung [Thu, 17 Jul 2014 18:09:45 +0000 (18:09 +0000)]
am
1e214f1d: Fixing regression in flinging not updating the stack. (Bug
16371020)
* commit '
1e214f1daa0ee51097a7b7cc4fd4680d9059016a':
Fixing regression in flinging not updating the stack. (Bug
16371020)
Adam Connors [Thu, 17 Jul 2014 18:09:42 +0000 (18:09 +0000)]
am
d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
* commit '
d50ec637fab02ee54295dc6dbeac00214097b36d':
Create DPM APIs for cross profile callerId
Niels Egberts [Thu, 17 Jul 2014 18:09:38 +0000 (18:09 +0000)]
am
a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev
* commit '
a66d298ea27d7cb7d5927869eda196e2fa56da78':
TtsSpan builders for each TtsSpan type. DO NOT MERGE
Nancy Chen [Thu, 17 Jul 2014 18:09:28 +0000 (18:09 +0000)]
am
4a9b99f5: API changes to enable account selection for a call
* commit '
4a9b99f5d8a4a9a3ce6f4a45d577a8a92cfcf511':
API changes to enable account selection for a call
Craig Mautner [Thu, 17 Jul 2014 18:09:25 +0000 (18:09 +0000)]
am
b1c0b008: Merge "resolved conflicts for merge of
75f31740 to lmp-dev" into lmp-dev
* commit '
b1c0b0082d535a48d3e916f1a0b70219c84e83c2':
Wait for all windows to draw before turning screen on
Martin Kosiba [Thu, 17 Jul 2014 18:09:21 +0000 (18:09 +0000)]
am
92486999: Allow for appending of resources to an AssetManager.
* commit '
92486999f4f34e73df8e31f97b378f8dd66b5aa9':
Allow for appending of resources to an AssetManager.
Alexandra Gherghina [Thu, 17 Jul 2014 18:09:17 +0000 (18:09 +0000)]
am
dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
* commit '
dbfd074444b47f13cfc655142fdc3738bb8136e8':
Ads per-user APIs to manage accounts through the AccountManager
Amith Yamasani [Thu, 17 Jul 2014 18:09:14 +0000 (18:09 +0000)]
am
467bc0ef: Merge "Keep track of user_setup_complete in DPMS" into lmp-dev
* commit '
467bc0efa37b977abda6349eb75208bf103422e3':
Keep track of user_setup_complete in DPMS
Jae Seo [Thu, 17 Jul 2014 18:09:10 +0000 (18:09 +0000)]
am
f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev
* commit '
f977db2e87fdc9ba383c3ba808d2ad686a9c26ac':
TIF: Add TvInputInfo.getParentId
Kenny Guy [Thu, 17 Jul 2014 18:09:04 +0000 (18:09 +0000)]
am
41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev
* commit '
41482465da91ec79cf56d18fc25ebd7533a27489':
Allow app restrictions for uninstalled packages.
Chris Craik [Thu, 17 Jul 2014 18:09:01 +0000 (18:09 +0000)]
am
ec9c58c1: Merge "Initializing variables - generally a good practice" into lmp-dev
* commit '
ec9c58c15d19809827f2cb48df9715433bfa9ed5':
Initializing variables - generally a good practice
RoboErik [Thu, 17 Jul 2014 19:50:25 +0000 (19:50 +0000)]
Merge "return false for media keys if no controller" into lmp-dev
RoboErik [Thu, 17 Jul 2014 19:17:27 +0000 (12:17 -0700)]
return false for media keys if no controller
bug:
16311395
Change-Id: I4cde865858f99a9159abc181cc987fbd9866025b
Chris Craik [Thu, 17 Jul 2014 19:31:31 +0000 (19:31 +0000)]
Merge "Minor cleanups around color usage" into lmp-dev
Chris Craik [Thu, 17 Jul 2014 19:25:11 +0000 (12:25 -0700)]
Minor cleanups around color usage
Change-Id: I56733cbe933a58d5977c032f056abb35265ee252
Chris Craik [Thu, 17 Jul 2014 19:26:24 +0000 (19:26 +0000)]
Merge "Simplify ViewRootImpl's AttachInfo usage" into lmp-dev
Chris Craik [Thu, 17 Jul 2014 17:16:51 +0000 (10:16 -0700)]
Simplify ViewRootImpl's AttachInfo usage
Change-Id: I4230e95ed5a52c8c5fae7d7b8d58827925db13ba
John Reck [Thu, 17 Jul 2014 18:12:51 +0000 (18:12 +0000)]
Merge "Fix logging" into lmp-dev
John Reck [Thu, 17 Jul 2014 18:00:36 +0000 (11:00 -0700)]
Fix logging
Bug:
16357287
Change-Id: Ic14e32c941e42ab1f1ed51ff8ed7185979e57a55
Jeff Sharkey [Thu, 17 Jul 2014 18:08:38 +0000 (18:08 +0000)]
Merge "Support cluster-style installs for bundled apps." into lmp-dev
Jeff Sharkey [Thu, 17 Jul 2014 17:56:48 +0000 (10:56 -0700)]
Support cluster-style installs for bundled apps.
Bug:
16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
Joe Fernandez [Thu, 17 Jul 2014 18:04:47 +0000 (18:04 +0000)]
am
e1e81a9e: am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
e1e81a9ee0f3632898eff1056fd2283b79789e23':
docs: Update ADT-1 page with supported apps
Ruben Brunk [Thu, 17 Jul 2014 18:02:28 +0000 (11:02 -0700)]
camera2: Fix swapped Face detection commands.
Bug:
16343647
Change-Id: I06186b1d6a2ef5d73d2e22759e947156d43cab3f
Sandeep Siddhartha [Thu, 17 Jul 2014 05:53:19 +0000 (22:53 -0700)]
Support model deletion
the updateKeyphrase call is also used to clear out a sound model currently,
this happens when the sound model passed in has no keyphrases.
We can revisit if we need another deleteSoundModel method
- Also fix an issue with the way we were writing keyphrase to the DB
and when updating keyphrase, we actually addOrUpdate
Change-Id: Ib7250c2fdafef6bc40387912a79366c334d73292
Winson Chung [Thu, 17 Jul 2014 19:33:24 +0000 (19:33 +0000)]
Merge "Fixing optimization in Task loading. (Bug
16372369)" into lmp-dev
Winson Chung [Thu, 17 Jul 2014 19:30:07 +0000 (12:30 -0700)]
Fixing optimization in Task loading. (Bug
16372369)
Christopher Tate [Tue, 15 Jul 2014 19:37:38 +0000 (12:37 -0700)]
Add BackupAgent.onRestoreFinished() callback
The agent's onRestoreFinished() method is called after all available
data has been delivered to the app, whether via the key/value restore
API or the full-data file-at-a-time API. This gives the app a stable
opportunity to do any postprocessing that might be appropriate.
Also fixes a lingering bug in the framework's handling of backup
agent lifetimes. In cases where an existing agent instances was
being rebound, the framework was forgetting to notify the dependent
that the agent was available. This was causing timeouts and restore
failure.
Bug
16241004
Change-Id: I3f52b299312d30d38b0cba63a2cfaeb934991ef2
ztenghui [Wed, 16 Jul 2014 18:17:56 +0000 (11:17 -0700)]
Add the RTL support to VectorDrawable.
bug:
15905631
Change-Id: Ieb3dcac2dd446ba89f307716411688dcd6ec5279
John Reck [Thu, 17 Jul 2014 17:30:22 +0000 (10:30 -0700)]
Revert "Separate Canvas JNI code from the implementation."
This reverts commit
e28a5afee885cd69a5be5809f88116b601cb1a72.
Appears to cause memory corruption and random appearances of
chinese
Bug:
16343240
Bug:
16336642
Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b
Winson Chung [Thu, 17 Jul 2014 17:30:42 +0000 (10:30 -0700)]
Fixing regression in flinging not updating the stack. (Bug
16371020)
Change-Id: I6397c854dc0d305206eb3b48de855c58cf2740ea
Nancy Chen [Tue, 8 Jul 2014 21:16:17 +0000 (14:16 -0700)]
API changes to enable account selection for a call
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.
Bug:
16243703
Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
Martin Kosiba [Thu, 16 Jan 2014 16:25:56 +0000 (16:25 +0000)]
Allow for appending of resources to an AssetManager.
BUG:
11505352
Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
Alexandra Gherghina [Thu, 3 Jul 2014 10:40:08 +0000 (11:40 +0100)]
Ads per-user APIs to manage accounts through the AccountManager
Bug:
16056552
Bug:
14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
Joe Fernandez [Thu, 17 Jul 2014 16:44:19 +0000 (16:44 +0000)]
am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
e287cf33d4cd69aef2177d025a110cf8b9f0e267':
docs: Update ADT-1 page with supported apps
Jeff Davidson [Thu, 17 Jul 2014 16:41:38 +0000 (16:41 +0000)]
am
14648e40: Merge "Restrict SCORE_NETWORKS permission to signature|system." into lmp-dev
* commit '
14648e403c20a6a6c78c9b26e2f45bf99248c882':
Restrict SCORE_NETWORKS permission to signature|system.
Julia Reynolds [Thu, 17 Jul 2014 16:37:39 +0000 (16:37 +0000)]
am
9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev
* commit '
9c9cb566810a3763532606b5a4b3596814668fba':
Update message on DISALLOW_REMOVE_USERS constant.
Torne (Richard Coles) [Thu, 17 Jul 2014 16:20:48 +0000 (16:20 +0000)]
am
07119f4a: Use the WebView\'s loader library to load the real library.
* commit '
07119f4ad995fa768492889e6644b4da72d26dd7':
Use the WebView's loader library to load the real library.
Torne (Richard Coles) [Thu, 17 Jul 2014 16:20:44 +0000 (16:20 +0000)]
am
62cb4390: Remove WebView library preloading mechanism.
* commit '
62cb4390dd67f7bd9da25e225a4503bc8dc11fdf':
Remove WebView library preloading mechanism.
John Spurlock [Thu, 17 Jul 2014 16:20:41 +0000 (16:20 +0000)]
am
1ae06eb3: Merge "Zen: Maintain selection throughout rocker session." into lmp-dev
* commit '
1ae06eb35037256cf4d03c6b4e4f50f26b6b2e0f':
Zen: Maintain selection throughout rocker session.
Torne (Richard Coles) [Thu, 8 May 2014 15:07:05 +0000 (16:07 +0100)]
Use the WebView's loader library to load the real library.
Load libwebviewchromiumloader and use it to load the real WebView
library, to enable sharing of the relro segment between different
application processes without requiring that the library be preloaded in
the zygote. A system service is added to track whether the relro segment
file has been prepared, and block loading of the library until it has
been.
Bug:
13005501
Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
Torne (Richard Coles) [Fri, 2 May 2014 14:21:54 +0000 (15:21 +0100)]
Remove WebView library preloading mechanism.
We don't want to preload the WebView library in the zygote process any
more, as loading an updatable WebView in the zygote is a stability risk.
The memory benefits of preloading will be obtained in other ways.
Bug:
13005501
Change-Id: Ic89f2a1d057dc92b01fb775bf326b47ac2d4caa2
Craig Mautner [Thu, 17 Jul 2014 17:51:43 +0000 (17:51 +0000)]
Merge "resolved conflicts for merge of
0a931069 to lmp-dev" into lmp-dev
Craig Mautner [Thu, 17 Jul 2014 17:50:18 +0000 (10:50 -0700)]
resolved conflicts for merge of
0a931069 to lmp-dev
Conflicts:
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
Craig Mautner [Thu, 17 Jul 2014 17:16:49 +0000 (17:16 +0000)]
Merge "resolved conflicts for merge of
75f31740 to lmp-dev" into lmp-dev
Craig Mautner [Thu, 17 Jul 2014 17:05:07 +0000 (10:05 -0700)]
resolved conflicts for merge of
75f31740 to lmp-dev
Conflicts:
services/core/java/com/android/server/wm/WindowManagerService.java
Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
Amith Yamasani [Thu, 17 Jul 2014 17:08:40 +0000 (17:08 +0000)]
Merge "Keep track of user_setup_complete in DPMS" into lmp-dev
Jae Seo [Thu, 17 Jul 2014 17:04:17 +0000 (17:04 +0000)]
Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev
John Spurlock [Thu, 17 Jul 2014 15:59:15 +0000 (15:59 +0000)]
am
f0580c6e: Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev
* commit '
f0580c6e818e371b0934d560284f3b8e5606425d':
Shade: Hide the status icons from the collapsed header.
Przemyslaw Szczepaniak [Thu, 17 Jul 2014 15:55:19 +0000 (15:55 +0000)]
am
95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev
* commit '
95546693a23d252855ce62549269348153bdbc97':
Add AudioAttributes support in the TTS.
John Spurlock [Thu, 17 Jul 2014 15:51:21 +0000 (15:51 +0000)]
am
791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev
* commit '
791c827c22c8d0179500f0df201a58bce62ad68e':
Zen: Return of the alarm warning.
Kenny Guy [Thu, 17 Jul 2014 15:20:21 +0000 (15:20 +0000)]
am
6ec1e21d: Merge "Check for exported and category before starting activity." into lmp-dev
* commit '
6ec1e21d4f9a5e76ff23b791c350890ae4b784a1':
Check for exported and category before starting activity.
Nicolas Prevot [Thu, 17 Jul 2014 14:19:28 +0000 (14:19 +0000)]
Filip Gruszczynski [Thu, 17 Jul 2014 14:19:25 +0000 (14:19 +0000)]
am
e26a2536: am
95198b91: am
39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '
e26a25361d9ae649f0855f69afc1cce1b7d3116a':
Using outset bottom from theme as bottom inset on circular screens.
Adrian Roos [Thu, 17 Jul 2014 14:19:21 +0000 (14:19 +0000)]
am
3e7b4279: Merge "Update QS user switcher colors to spec" into lmp-dev
* commit '
3e7b4279abee870d5094f505a9bbdcd42c9a7256':
Update QS user switcher colors to spec
Adrian Roos [Thu, 17 Jul 2014 14:19:17 +0000 (14:19 +0000)]
am
221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev
* commit '
221433ab83c1d6719b563f07314c474743ea7416':
Partially fix the keyguard scrim
Dianne Hackborn [Thu, 17 Jul 2014 14:19:09 +0000 (14:19 +0000)]
am
cf3580b0: Merge "Fix build." into lmp-dev
* commit '
cf3580b0c64a69173bfe1423a023d1dbd56b0ef5':
Fix build.
Chulwoo Lee [Thu, 17 Jul 2014 14:19:04 +0000 (14:19 +0000)]
am
62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev
* commit '
62572cabc4083b716d15f85a36eaf4225415b9d8':
Pass input ID to the setup/settings activity
Chulwoo Lee [Thu, 17 Jul 2014 14:19:01 +0000 (14:19 +0000)]
am
02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev
* commit '
02023167740b862c0df7541a23f825eb5463c3f8':
Introduce "input_id" column to the channels table
Dianne Hackborn [Thu, 17 Jul 2014 14:18:56 +0000 (14:18 +0000)]
am
dbec91c0: Implement issue #
16330060: Inform ActivityManager about WebView...
* commit '
dbec91c09bd8c184e897d36b8150307ad4713c6c':
Implement issue #
16330060: Inform ActivityManager about WebView...
Sandeep Siddhartha [Thu, 17 Jul 2014 14:18:49 +0000 (14:18 +0000)]
am
47ecf354: Plumb the database code to read/update sound models
* commit '
47ecf354c7d43bd6f6df5f6a6de78fb9201b3805':
Plumb the database code to read/update sound models
Sandeep Siddhartha [Thu, 17 Jul 2014 14:18:43 +0000 (14:18 +0000)]
am
aecd5383: Add recognition modes to the enrollment metadata
* commit '
aecd5383e3647d9428dc3c83c894830ab2efc421':
Add recognition modes to the enrollment metadata
Alan Viverette [Thu, 17 Jul 2014 14:18:38 +0000 (14:18 +0000)]
am
bbbbb3b2: Add public attributes for TimePicker styling
* commit '
bbbbb3b25050e624c6e4c75a9c76c043695b92d5':
Add public attributes for TimePicker styling
Dan Sandler [Thu, 17 Jul 2014 14:17:16 +0000 (14:17 +0000)]
am
ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev
* commit '
ce4dc71cfc0ecbfe1bd504b5d906fbd81b2164b1':
Album artwork returns triumphantly to the lockscreen.
John Spurlock [Thu, 17 Jul 2014 14:17:12 +0000 (14:17 +0000)]
am
efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit '
efe8514f89c8f8ecd256f8fc1ef577cbcec05421':
Update data limit notification icon + strings.
Sandeep Siddhartha [Thu, 17 Jul 2014 14:17:08 +0000 (14:17 +0000)]
am
43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
* commit '
43bc655b3c5ddd70af813280d9125797d076d00e':
Add code for isKeyphraseActive and some logging to help debug issues
John Spurlock [Thu, 17 Jul 2014 14:17:05 +0000 (14:17 +0000)]
am
45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
* commit '
45aebdf2d2b552914abf9656a69bc92bd6540b54':
Add a zen-specific event sink, include in dumpstate.
Amith Yamasani [Thu, 17 Jul 2014 14:17:01 +0000 (14:17 +0000)]
am
b31b07c8: Merge "Allow content provider access across users" into lmp-dev
* commit '
b31b07c8b10937f3071300068da64158d3686513':
Allow content provider access across users
Lorenzo Colitti [Thu, 17 Jul 2014 14:16:57 +0000 (14:16 +0000)]
am
1098531c: Disable logging in NetlinkTracker.
* commit '
1098531c19d337b4544c51e446e859d86e7fdab9':
Disable logging in NetlinkTracker.
Chris Craik [Thu, 17 Jul 2014 14:16:53 +0000 (14:16 +0000)]
am
b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
* commit '
b63869a6fb76ede4492f2184ae005687ac70c916':
Add accessibility text contrast setting
Santos Cordon [Thu, 17 Jul 2014 14:16:50 +0000 (14:16 +0000)]
am
ec82a805: Add toString & equals helper methods to PhoneAccount.java
* commit '
ec82a805b55ce61e2049d66d74fbab5610577013':
Add toString & equals helper methods to PhoneAccount.java
Baligh Uddin [Thu, 17 Jul 2014 14:16:47 +0000 (14:16 +0000)]
am
54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
54639300d0ec7424fe6b18ba82f0293c2543c62f':
Import translations. DO NOT MERGE
John Spurlock [Thu, 17 Jul 2014 14:16:43 +0000 (14:16 +0000)]
am
fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit '
fddad8871e41cedc2b0bb31edd7f3a509ac7c403':
QS: Deal with null uuids in BT controller.
Baligh Uddin [Thu, 17 Jul 2014 14:16:40 +0000 (14:16 +0000)]
am
9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9988df2980dbe0529eca8ba4379b061197166a55':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:36 +0000 (14:16 +0000)]
am
da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
da616efd015e372c3e02c1b9368fe66badb0341d':
Import translations. DO NOT MERGE
Jungshik Jang [Thu, 17 Jul 2014 14:16:33 +0000 (14:16 +0000)]
am
6d98d91f: Merge "Hook up system audio mode" into lmp-dev
* commit '
6d98d91f01dc77af031bf9d8537d101110ba43e5':
Hook up system audio mode
Dianne Hackborn [Thu, 17 Jul 2014 14:16:30 +0000 (14:16 +0000)]
am
8b353ef1: Merge "Maybe fix issue #
16167054: Wakelock is acquired and released in..." into lmp-dev
* commit '
8b353ef1ac284d2ad306de7d6609ebc1b1053ede':
Maybe fix issue #
16167054: Wakelock is acquired and released in...
Vinit Deshpande [Thu, 17 Jul 2014 14:16:26 +0000 (14:16 +0000)]
am
0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit '
0b4d73dd5885a2ef86e14f77ff1963c42d6c59b9':
Introduce RTT Manager
Chelsea Derrick [Thu, 17 Jul 2014 14:16:23 +0000 (14:16 +0000)]
am
52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
* commit '
52c8bd50f87388f6c32b3664d46723490e7e3502':
Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
Baligh Uddin [Thu, 17 Jul 2014 14:16:19 +0000 (14:16 +0000)]
am
6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6b7e527ae3433a7be5234578d923a6ed149e3e48':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:16 +0000 (14:16 +0000)]
am
ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ca0db50aaa768353686fdcf76de6dfb701bf67e0':
Import translations. DO NOT MERGE