OSDN Git Service
Matthew Fritze [Thu, 21 Jul 2016 00:59:28 +0000 (00:59 +0000)]
Merge \\"Error colors to point to frameworks rather than hard-code them\\" into nyc-mr1-dev am:
948400a43d
am:
85d688cd79
Change-Id: I214563e1cd9ad44c99ea34c5480bc7ab1814a975
Robert Shih [Thu, 21 Jul 2016 00:53:12 +0000 (00:53 +0000)]
Merge "MediaExtractor: Javadoc should mention INTERNET permission"
Robert Shih [Thu, 21 Jul 2016 00:45:27 +0000 (17:45 -0700)]
MediaExtractor: Javadoc should mention INTERNET permission
Bug:
10673034
Change-Id: Iea1196c76b09fa5b8f5b2d11a461eeb4c6578a1b
Matthew Fritze [Wed, 20 Jul 2016 23:47:23 +0000 (23:47 +0000)]
Merge \"Error colors to point to frameworks rather than hard-code them\" into nyc-mr1-dev
am:
948400a43d
Change-Id: Ibeca72659bbd13b1a5a8bdb009fc6a5021f8acbf
Adrian Roos [Wed, 20 Jul 2016 23:46:42 +0000 (23:46 +0000)]
Merge \\"Direct Reply: Allow closing IME separately from DirectReply mode\\" into nyc-mr1-dev am:
01acf40e0f
am:
96b91f692b
Change-Id: I0e105bd5e0d9d8a3d879bc62d5942c4be38ff595
Adrian Roos [Wed, 20 Jul 2016 23:41:14 +0000 (23:41 +0000)]
Merge \"Direct Reply: Allow closing IME separately from DirectReply mode\" into nyc-mr1-dev
am:
01acf40e0f
Change-Id: I0d38aca1c53c31e54819979eafd2f2dc37b2071a
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks rather than hard-code them" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:29:17 +0000 (23:29 +0000)]
Merge "Direct Reply: Allow closing IME separately from DirectReply mode" into nyc-mr1-dev
Doris Liu [Wed, 20 Jul 2016 23:22:03 +0000 (23:22 +0000)]
Merge \\"Fix VD animator not being properly resumed\\" into nyc-mr1-dev am:
ffa880b83f
am:
ea01b159b7
Change-Id: I72661874e79e48b121030a6abce849a2a319cc36
Michael Kwan [Wed, 20 Jul 2016 23:22:00 +0000 (23:22 +0000)]
Merge \\"Fix crash on devices with 1.2\\" screens.\\" into nyc-mr1-dev am:
70a789f569
am:
c170ce9ca4
Change-Id: I5b191acddf66ada9df6ccd43fb514b9b7070d15e
Doris Liu [Wed, 20 Jul 2016 23:15:43 +0000 (23:15 +0000)]
Merge \"Fix VD animator not being properly resumed\" into nyc-mr1-dev
am:
ffa880b83f
Change-Id: Ie10f5c12f528fb3d07765d724ee2a59138863906
Michael Kwan [Wed, 20 Jul 2016 23:15:33 +0000 (23:15 +0000)]
Merge \"Fix crash on devices with 1.2\" screens.\" into nyc-mr1-dev
am:
70a789f569
Change-Id: I18e99a65c5a8aeafe75f2a872ac39c8a4ac4f5a4
Makoto Onuki [Wed, 20 Jul 2016 23:15:32 +0000 (23:15 +0000)]
Merge \\"Support multiple intents in ShortcutInfo\\" into nyc-mr1-dev am:
b84ce2e034
am:
9a6109f284
Change-Id: I0f1caf54cc544db0b73f8e3275005923904f57a8
Chris Thornton [Wed, 20 Jul 2016 23:15:22 +0000 (23:15 +0000)]
Merge \\"SoundTriggerHelpoer: Send pause events on abort if a model is running.\\" into nyc-mr1-dev am:
d661476c98
am:
c0bcb77315
Change-Id: Icda8c384b6c1100881d9cb800b2f39d25d09c800
Doris Liu [Wed, 20 Jul 2016 23:10:52 +0000 (23:10 +0000)]
Merge "Fix VD animator not being properly resumed" into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:09:55 +0000 (23:09 +0000)]
Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
am:
b84ce2e034
Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca
Chris Thornton [Wed, 20 Jul 2016 23:09:42 +0000 (23:09 +0000)]
Merge \"SoundTriggerHelpoer: Send pause events on abort if a model is running.\" into nyc-mr1-dev
am:
d661476c98
Change-Id: Ie470d782d3e16a440c345a444d4eb29cebec34b4
Michael Kwan [Wed, 20 Jul 2016 23:08:04 +0000 (23:08 +0000)]
Merge "Fix crash on devices with 1.2" screens." into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:05:29 +0000 (23:05 +0000)]
Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:05:20 +0000 (23:05 +0000)]
Merge "SoundTriggerHelpoer: Send pause events on abort if a model is running." into nyc-mr1-dev
Chris Tate [Wed, 20 Jul 2016 23:04:29 +0000 (23:04 +0000)]
Merge \\"Run the SELinux wallpaper restorecon operations on all users\\" into nyc-mr1-dev am:
bf9fa8280e
am:
7ce8cfbec4
Change-Id: I8e5e20a2a9b21ec6a704aa9c7abb3a0ef1878d12
Christopher Tate [Wed, 20 Jul 2016 22:58:03 +0000 (22:58 +0000)]
Merge \"Run the SELinux wallpaper restorecon operations on all users\" into nyc-mr1-dev
am:
bf9fa8280e
Change-Id: I06a8e2f5510f019f6c553a7b26ce602a690f9732
Chris Tate [Wed, 20 Jul 2016 22:45:10 +0000 (22:45 +0000)]
Merge "Run the SELinux wallpaper restorecon operations on all users" into nyc-mr1-dev
Michael Kwan [Wed, 20 Jul 2016 22:12:02 +0000 (15:12 -0700)]
Fix crash on devices with 1.2" screens.
Bug:
30109315
Change-Id: Ia28f6dfcb833db966cc33ad289b5c7b5867b2407
Adam Lesinski [Wed, 20 Jul 2016 22:10:44 +0000 (22:10 +0000)]
Merge \\"BatteryStats: Don\\'t print empty platform idle state\\" into nyc-mr1-dev am:
ebbbead915
am:
7da697a79f
Change-Id: I644c302cc1cbea8b2387d9ac591845b7c43cc5c0
Christopher Tate [Wed, 20 Jul 2016 22:10:18 +0000 (15:10 -0700)]
Run the SELinux wallpaper restorecon operations on all users
And only run them once per device boot lifetime.
Bug
30229410
Change-Id: Ia6f7f7eea7f8985c83b531dfa16e96d08235b901
Adrian Roos [Wed, 20 Jul 2016 22:05:43 +0000 (22:05 +0000)]
Merge \\"Direct Reply: Fix circular reveal origin\\" into nyc-mr1-dev am:
c50f8ae532
am:
2a7f27180d
Change-Id: I83186a86c1222170e93e90e2f752f2751f206d05
Adam Lesinski [Wed, 20 Jul 2016 22:05:38 +0000 (22:05 +0000)]
Merge \"BatteryStats: Don\'t print empty platform idle state\" into nyc-mr1-dev
am:
ebbbead915
Change-Id: Ia651ad5a0a183ff7d70d90f119ec9238c15711ad
Adrian Roos [Mon, 18 Jul 2016 21:23:32 +0000 (14:23 -0700)]
Direct Reply: Allow closing IME separately from DirectReply mode
If the IME is showing, the first BACK now closes just
the IME instead of also closing the Direct Reply mode.
Subsequent back closes the notification panel as usual.
Change-Id: Ic4b5a4d6b528a211c2fa0c8b5ceb0f7017c09400
Fixes:
29996385
Adrian Roos [Wed, 20 Jul 2016 22:00:35 +0000 (22:00 +0000)]
Merge \"Direct Reply: Fix circular reveal origin\" into nyc-mr1-dev
am:
c50f8ae532
Change-Id: Ib3083e87f162a103acc6483b0f3367db73e1b269
TreeHugger Robot [Wed, 20 Jul 2016 21:56:01 +0000 (21:56 +0000)]
Merge "BatteryStats: Don't print empty platform idle state" into nyc-mr1-dev
Adrian Roos [Wed, 20 Jul 2016 21:49:02 +0000 (21:49 +0000)]
Merge "Direct Reply: Fix circular reveal origin" into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 21:21:18 +0000 (14:21 -0700)]
Support multiple intents in ShortcutInfo
Also fix b/
30230996.
TODO: Support the sourceBounds argument to LauncherApps.
startShortcut().
Bug
30218829
Bug
30230996
Change-Id: Ibb6c59d5b7c0a320c21d09436d016d0eac94644f
Chris Thornton [Wed, 20 Jul 2016 01:56:15 +0000 (18:56 -0700)]
SoundTriggerHelpoer: Send pause events on abort if a model is running.
If the recognition was aborted due to the service state being set to
false, clients were not made aware that the model had been stopped (but
would get a resume event).
Bug:
30233664
Change-Id: I9f663362ff142eadfd5ef727c5f0c941f8e9e89d
Ye Wen [Wed, 20 Jul 2016 21:28:12 +0000 (21:28 +0000)]
Merge \\"Add carrier config for close connection after MMS request\\" into nyc-mr1-dev am:
f2598319c0
am:
2395da5e82
Change-Id: Ia6a5877bf5ca52cf65b2ee7a85642a00b208428f
Ye Wen [Wed, 20 Jul 2016 21:22:05 +0000 (21:22 +0000)]
Merge \"Add carrier config for close connection after MMS request\" into nyc-mr1-dev
am:
f2598319c0
Change-Id: Ia16874474f755b601a02032e34b8dbff81971af8
Ye Wen [Wed, 20 Jul 2016 21:17:51 +0000 (21:17 +0000)]
Merge "Add carrier config for close connection after MMS request" into nyc-mr1-dev
Suprabh Shukla [Wed, 20 Jul 2016 21:10:08 +0000 (21:10 +0000)]
Merge \\"Setting a system property when device goes into demo mode\\" into nyc-mr1-dev am:
24db3ab8b9
am:
71f9adc3b5
Change-Id: I294f1e88fb81aa64d80494c858f6850eb2d74b63
Wale Ogunwale [Wed, 20 Jul 2016 21:05:26 +0000 (21:05 +0000)]
Merge changes Ia451b623,I1dd2c460
* changes:
Switched WindowState to use WindowContainer for managing children
Added WindowContainer and WindowContainerTest classes.
TreeHugger Robot [Wed, 20 Jul 2016 21:03:33 +0000 (21:03 +0000)]
Merge "Made WindowState.mParentWindow private scoped."
Suprabh Shukla [Wed, 20 Jul 2016 21:01:09 +0000 (21:01 +0000)]
Merge \"Setting a system property when device goes into demo mode\" into nyc-mr1-dev
am:
24db3ab8b9
Change-Id: Iadedc063f7058a7d1f22e0151a8ebfc9a6a8dff1
Matthew Fritze [Tue, 19 Jul 2016 20:13:41 +0000 (13:13 -0700)]
Error colors to point to frameworks rather than hard-code them
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res.
Change-Id: Ia203ff6966cd58a3bc23eb883460f0f8abb050f5
Fixes:
30021554
TreeHugger Robot [Wed, 20 Jul 2016 20:52:45 +0000 (20:52 +0000)]
Merge "Setting a system property when device goes into demo mode" into nyc-mr1-dev
Julia Reynolds [Wed, 20 Jul 2016 20:51:12 +0000 (20:51 +0000)]
Merge \\"Snooze schedule rules that were canceled by alarms.\\" into nyc-mr1-dev am:
ae0aed951b
am:
261b655396
Change-Id: Icd0ff5a828d0f2a39bb0e39085cd9fd7788f354f
Julia Reynolds [Wed, 20 Jul 2016 20:45:13 +0000 (20:45 +0000)]
Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
am:
ae0aed951b
Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290
Doris Liu [Wed, 20 Jul 2016 02:04:31 +0000 (19:04 -0700)]
Fix VD animator not being properly resumed
VectorDrawable animators remove themselves from RenderThread's
animator list when they detect their target not being in the
DisplayList. When the target got added back into DisplayList
without an invalidation(), the animators were not added to
the running animator list, therefore didn't continue to run.
This CL detects for the case where a VD is back in the DisplayList
and reactivate its animator.
BUG:
30101451
Change-Id: Ib5eb54af954a58a2fa617643bfcf5af40ce708a5
TreeHugger Robot [Wed, 20 Jul 2016 20:30:09 +0000 (20:30 +0000)]
Merge "Snooze schedule rules that were canceled by alarms." into nyc-mr1-dev
Felipe Leme [Wed, 20 Jul 2016 19:27:02 +0000 (19:27 +0000)]
Merge \\"Improved storage size detection.\\" into nyc-mr1-dev am:
f0de4da42f
am:
d8b866e615
Change-Id: Ied4ea6aeb589ed0b64e16b40b8a7df2ddf50b99b
Felipe Leme [Wed, 20 Jul 2016 19:19:19 +0000 (19:19 +0000)]
Merge \"Improved storage size detection.\" into nyc-mr1-dev
am:
f0de4da42f
Change-Id: I9794d1d3e15177c88e49911e1b406433025e85c4
Bryan Mawhinney [Wed, 20 Jul 2016 19:18:16 +0000 (19:18 +0000)]
Merge \\"Add .mov to MediaScanner video file types\\" into nyc-mr1-dev am:
881bc352ee
am:
642e50621a
Change-Id: I706bf8992bf8090b5c818418b14278a7bf9e3637
Bryan Mawhinney [Wed, 20 Jul 2016 19:13:04 +0000 (19:13 +0000)]
Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
am:
881bc352ee
Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5
TreeHugger Robot [Wed, 20 Jul 2016 19:06:11 +0000 (19:06 +0000)]
Merge "Improved storage size detection." into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 19:26:49 +0000 (12:26 -0700)]
Direct Reply: Fix circular reveal origin
Makes sure the circular reveal origin matches the bounds of the
text. This is necessairy because the TextView for the last action
spans the full remaining width and is usually much larger than the
text, which makes the reveal look uncentered.
Also adds an animation for closing the direct reply view.
Bug:
29876991
Change-Id: Ib0ae8a12423f0ecfc573928a39634404c8232e40
TreeHugger Robot [Wed, 20 Jul 2016 18:58:52 +0000 (18:58 +0000)]
Merge "Add per-user versions of set{Component,Application}EnabledSetting."
Bryan Mawhinney [Wed, 20 Jul 2016 18:58:29 +0000 (18:58 +0000)]
Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev
Julia Reynolds [Tue, 19 Jul 2016 14:18:32 +0000 (10:18 -0400)]
Snooze schedule rules that were canceled by alarms.
So a reboot or snoozed alarm doesn't cause them to
reactivate.
Bug:
30087850
Change-Id: I83fdb88009b515d442993944aec40df7365e830f
Michael Wright [Wed, 20 Jul 2016 18:49:43 +0000 (18:49 +0000)]
Merge commit \'
f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d
am:
49bcc5dd80
Change-Id: Iee2a7015eefd6a75be2968ec855334f68ec5f79e
Michael Wright [Wed, 20 Jul 2016 18:41:58 +0000 (19:41 +0100)]
Merge commit '
f8bc27d9683e4089cdfd778dcb61ae67f44665b7' into manual_merge_f8bc27d
Christopher Ferris [Wed, 20 Jul 2016 18:33:21 +0000 (18:33 +0000)]
Merge \\\\"Remove dependency on android_alarm.h.\\\\" am:
c95e7a3014 am:
8f7223e420 am:
96d02a6c08
am:
e22f254cdb
Change-Id: I7abd1a47726aa5f34c56e576c150cce5843817ed
Christopher Ferris [Wed, 20 Jul 2016 18:26:41 +0000 (18:26 +0000)]
Merge \\\"Remove dependency on android_alarm.h.\\\" am:
c95e7a3014 am:
8f7223e420
am:
96d02a6c08
Change-Id: Ibb7cc1fa2c8ddeb3d0b7154f817d6c9738d079e4
Christopher Ferris [Wed, 20 Jul 2016 18:18:17 +0000 (18:18 +0000)]
Merge \\"Remove dependency on android_alarm.h.\\" am:
c95e7a3014
am:
8f7223e420
Change-Id: I7fd6c49a94b557772f3f2d9d2f751ef2fd42eee8
Christopher Ferris [Wed, 20 Jul 2016 18:10:47 +0000 (18:10 +0000)]
Merge \"Remove dependency on android_alarm.h.\"
am:
c95e7a3014
Change-Id: I19908fa29772c89b8112e371702da6197b20465d
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Remove dependency on android_alarm.h."
Ye Wen [Mon, 18 Jul 2016 21:36:22 +0000 (14:36 -0700)]
Add carrier config for close connection after MMS request
b/
29558615
Change-Id: I24d922f33626b4a65c267dc2d132b5510e357c0f
Fyodor Kupolov [Wed, 20 Jul 2016 17:41:42 +0000 (17:41 +0000)]
Merge "Added unit tests for UserController"
Fyodor Kupolov [Wed, 20 Jul 2016 17:40:54 +0000 (17:40 +0000)]
Merge "Do not migrate apps data on every user start"
Sudheer Shanka [Wed, 20 Jul 2016 00:49:33 +0000 (17:49 -0700)]
Add per-user versions of set{Component,Application}EnabledSetting.
Change-Id: Id63b233308e92a4c360f38d4728c519ac2131ff0
Fixes:
30230444
TreeHugger Robot [Wed, 20 Jul 2016 17:21:33 +0000 (17:21 +0000)]
Merge "Rename color transform to color mode and persist the value." into nyc-mr1-dev
Phil Weaver [Wed, 20 Jul 2016 17:03:37 +0000 (17:03 +0000)]
Merge \\"Suppress exceptions for corner-case a11y events.\\" into nyc-mr1-dev am:
39abe33b50
am:
5c749b8254
Change-Id: Id78b4ac49ee77a52d2e17f962e71328fb5cb4ba9
Phil Weaver [Wed, 20 Jul 2016 16:57:52 +0000 (16:57 +0000)]
Merge \"Suppress exceptions for corner-case a11y events.\" into nyc-mr1-dev
am:
39abe33b50
Change-Id: If169e5ab2a6241e6df720fa427a9eaee61d3cdc8
Phil Weaver [Wed, 20 Jul 2016 16:46:41 +0000 (16:46 +0000)]
Merge "Suppress exceptions for corner-case a11y events." into nyc-mr1-dev
Phil Weaver [Wed, 20 Jul 2016 16:45:46 +0000 (16:45 +0000)]
Merge "Add tests for accessibility motion event injector."
Jason Monk [Wed, 20 Jul 2016 16:09:41 +0000 (16:09 +0000)]
Merge \\"QS: Fix missing flashlight tile\\" into nyc-mr1-dev am:
761d89ef4e
am:
06a96735f9
Change-Id: I06ef81f0740eeab2a8822418fe5263308a136cd6
Dianne Hackborn [Wed, 20 Jul 2016 16:00:57 +0000 (16:00 +0000)]
Merge \\"Add reporting of long wake locks.\\" into nyc-mr1-dev am:
ca37695ebc
am:
af52a9d1bf
Change-Id: I29451b3dc161e29804f42f40aa9e15836979cd4a
Jason Monk [Wed, 20 Jul 2016 16:00:55 +0000 (16:00 +0000)]
Merge \"QS: Fix missing flashlight tile\" into nyc-mr1-dev
am:
761d89ef4e
Change-Id: I3761bee17e20d8c6039220766d195f2d5536c27a
Jason Monk [Wed, 20 Jul 2016 16:00:53 +0000 (16:00 +0000)]
Merge \\"QS: Fix crash in tile API\\" into nyc-mr1-dev am:
77d8771b30
am:
0c183d5572
Change-Id: I51846b2a8e98803f3b77949e56d4f6c99198c5e6
Dianne Hackborn [Wed, 20 Jul 2016 15:53:17 +0000 (15:53 +0000)]
Merge \"Add reporting of long wake locks.\" into nyc-mr1-dev
am:
ca37695ebc
Change-Id: I98b06d561945fddef5be4b749b5b2128b8622add
Jason Monk [Wed, 20 Jul 2016 15:53:11 +0000 (15:53 +0000)]
Merge \"QS: Fix crash in tile API\" into nyc-mr1-dev
am:
77d8771b30
Change-Id: I6669e736208ada6ebd5bd2fc9e0466f924bffd6a
Derek Sollenberger [Wed, 20 Jul 2016 15:53:05 +0000 (11:53 -0400)]
Fix ref-counting error when reseting a SkiaCanvas with a new SkCanvas.
Change-Id: Id2ed6627674cbd3112d6ac80f4e29a5ff65606b6
TreeHugger Robot [Wed, 20 Jul 2016 15:51:11 +0000 (15:51 +0000)]
Merge "QS: Fix missing flashlight tile" into nyc-mr1-dev
Dianne Hackborn [Wed, 20 Jul 2016 15:45:35 +0000 (15:45 +0000)]
Merge "Add reporting of long wake locks." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 15:44:18 +0000 (15:44 +0000)]
Merge "QS: Fix crash in tile API" into nyc-mr1-dev
Wale Ogunwale [Tue, 19 Jul 2016 15:00:46 +0000 (08:00 -0700)]
Switched WindowState to use WindowContainer for managing children
Bug:
30060889
Change-Id: Ia451b623123210514e79f830f92f6459169911b6
Jason Monk [Wed, 20 Jul 2016 14:25:16 +0000 (10:25 -0400)]
QS: Fix missing flashlight tile
- Use PM Feature to determine if flashlight tile should be available
- Retry getting camera later when we don't have one
Change-Id: I997baa4ee103ac0165329b4c80f0459268e584e7
Fixes:
29911941
Jason Monk [Wed, 20 Jul 2016 14:18:09 +0000 (10:18 -0400)]
QS: Fix crash in tile API
Change-Id: I9062839ab59236c20e35645701254ea2d24cc876
Fixes:
30224352
Diego Perez [Wed, 20 Jul 2016 12:32:47 +0000 (12:32 +0000)]
Merge "Ignore ?attr/windowActionBar when displaying menus"
Diego Perez [Wed, 20 Jul 2016 12:32:43 +0000 (12:32 +0000)]
Merge "More fixes for VectorDrawable memory management"
Diego Perez [Wed, 20 Jul 2016 12:32:24 +0000 (12:32 +0000)]
Merge "Restore getAccessibleMethod in the preferences inflater"
Derek Sollenberger [Wed, 20 Jul 2016 12:16:30 +0000 (12:16 +0000)]
Merge "Expose SkiaCanvas header file."
Paul Stewart [Wed, 20 Jul 2016 03:40:22 +0000 (03:40 +0000)]
Merge \"Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594 am:
9fd8d75ebc\" into nyc-mr1-dev-plus-aosp
am:
ff2fd6b227
Change-Id: Iaa26a75314cb4a79564128a9fb9ff3acc7d51d03
Paul Stewart [Wed, 20 Jul 2016 03:36:39 +0000 (03:36 +0000)]
Merge \"Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c am:
51bb81b46e\" into nyc-mr1-dev-plus-aosp
am:
21e0e88b17
Change-Id: I08ec5341bcdab7f7d27a740cb3d2c372e0badce9
Paul Stewart [Wed, 20 Jul 2016 03:36:35 +0000 (03:36 +0000)]
Merge \"WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5 am:
15058ed5e2\" into nyc-mr1-dev-plus-aosp
am:
3950675286
Change-Id: I6219e1518ed113628e71062d6eb4e496d73c4e42
Paul Stewart [Wed, 20 Jul 2016 03:36:30 +0000 (03:36 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594 am:
a7aa029132
am:
e6a1f3beef
Change-Id: I086e25935cd799bce96971a3b6ccaaed1713a5e9
Paul Stewart [Wed, 20 Jul 2016 03:36:26 +0000 (03:36 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c am:
756def010b
am:
01b9df55c5
Change-Id: Iafdd661d67dc39107ff851c69873fd88fbdd98ea
Paul Stewart [Wed, 20 Jul 2016 03:36:22 +0000 (03:36 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5 am:
371aa0d792
am:
879f848ebd
Change-Id: I9b587745a3cb3498372e1c0aeb04b7ba00cbf861
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:45 +0000 (03:30 +0000)]
Merge "Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594 am:
9fd8d75ebc" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:29 +0000 (03:30 +0000)]
Merge "Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c am:
51bb81b46e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:14 +0000 (03:30 +0000)]
Merge "WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5 am:
15058ed5e2" into nyc-mr1-dev-plus-aosp
Paul Stewart [Wed, 20 Jul 2016 03:29:44 +0000 (03:29 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594
am:
9fd8d75ebc
Change-Id: I1131987821d39b09c63e58d2d8b8d9054ba18b4d
Paul Stewart [Wed, 20 Jul 2016 03:29:40 +0000 (03:29 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c
am:
51bb81b46e
Change-Id: If9b2adc6ff344f48850681443b96040937ad8318
OSDN Git Service
