OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev...
Doris Ling [Thu, 4 Aug 2016 23:53:34 +0000 (23:53 +0000)]
Merge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev am: f32b03d124
am: 62fbeb8381

Change-Id: I9a2addc832f82e52940711986da25cc16b06ac31

7 years agoAdd metrics event for Settings->Display->Ambient Display. am: f3cd2c6116
Doris Ling [Thu, 4 Aug 2016 23:53:04 +0000 (23:53 +0000)]
Add metrics event for Settings->Display->Ambient Display. am: f3cd2c6116
am: 3105e6b1c0

Change-Id: I1d241f886c7f1fb0fcdc45157dee67c7f371da21

7 years agoMerge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev
Doris Ling [Thu, 4 Aug 2016 23:46:53 +0000 (23:46 +0000)]
Merge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev
am: f32b03d124

Change-Id: Iddeebcc713bf6728bcf207965fa0f784a7df6bb7

7 years agoAdd metrics event for Settings->Display->Ambient Display.
Doris Ling [Thu, 4 Aug 2016 23:46:32 +0000 (23:46 +0000)]
Add metrics event for Settings->Display->Ambient Display.
am: f3cd2c6116

Change-Id: If0d2928854e1aba8957e6956bbdcea99f37df79a

7 years agoMerge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev am...
Adrian Roos [Thu, 4 Aug 2016 23:44:55 +0000 (23:44 +0000)]
Merge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev am: d1726e7598
am: 4e36af0b4f

Change-Id: I0e73ba41b42062e4f318e7c0052af0d7abc08bea

7 years agoHIC: Add report facility for overzealous anti-falsing am: 7bb38a941b
Adrian Roos [Thu, 4 Aug 2016 23:44:52 +0000 (23:44 +0000)]
HIC: Add report facility for overzealous anti-falsing am: 7bb38a941b
am: 9d28754215

Change-Id: Ie7999016b62b9b2ad3ef96fa3df0ee4f638ca993

7 years agoMerge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev
Doris Ling [Thu, 4 Aug 2016 23:39:37 +0000 (23:39 +0000)]
Merge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev

7 years agoMerge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev
Adrian Roos [Thu, 4 Aug 2016 23:37:31 +0000 (23:37 +0000)]
Merge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev
am: d1726e7598

Change-Id: I57040d3c94030b3c412b130c17f2df3ed926a98d

7 years agoHIC: Add report facility for overzealous anti-falsing
Adrian Roos [Thu, 4 Aug 2016 23:37:29 +0000 (23:37 +0000)]
HIC: Add report facility for overzealous anti-falsing
am: 7bb38a941b

Change-Id: Ie40c0e42dcdc788757f18f65d8edc3e8ba2a6995

7 years agoMerge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev
Adrian Roos [Thu, 4 Aug 2016 23:24:03 +0000 (23:24 +0000)]
Merge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev

7 years agoMerge "Only reorient nav bar if needed" into nyc-mr1-dev am: 34b68d3c84
Adrian Roos [Thu, 4 Aug 2016 23:18:20 +0000 (23:18 +0000)]
Merge "Only reorient nav bar if needed" into nyc-mr1-dev am: 34b68d3c84
am: 76398d43c0

Change-Id: Ic39bf39c559242a832c459080c87e502cfc24c36

7 years agoOnly reorient nav bar if needed am: 090b7d82d2
Adrian Roos [Thu, 4 Aug 2016 23:18:11 +0000 (23:18 +0000)]
Only reorient nav bar if needed am: 090b7d82d2
am: f754b932c3

Change-Id: I5f49db0be5c20bad91f5c6dfda205401990a982c

7 years agoMerge "Only reorient nav bar if needed" into nyc-mr1-dev
Adrian Roos [Thu, 4 Aug 2016 23:14:18 +0000 (23:14 +0000)]
Merge "Only reorient nav bar if needed" into nyc-mr1-dev
am: 34b68d3c84

Change-Id: I42873135ca5fd58e24825c686b4b562cd16dab4b

7 years agoOnly reorient nav bar if needed
Adrian Roos [Thu, 4 Aug 2016 23:14:15 +0000 (23:14 +0000)]
Only reorient nav bar if needed
am: 090b7d82d2

Change-Id: Ib45e3a9ebadd719b392b22278eab83d7bc56d407

7 years agoMerge "Only reorient nav bar if needed" into nyc-mr1-dev
Adrian Roos [Thu, 4 Aug 2016 23:06:45 +0000 (23:06 +0000)]
Merge "Only reorient nav bar if needed" into nyc-mr1-dev

7 years agoMerge "setCarMode() only when car mode changes" into nyc-mr1-dev am: 6bcf0cdf37
Annie Chin [Thu, 4 Aug 2016 22:21:52 +0000 (22:21 +0000)]
Merge "setCarMode() only when car mode changes" into nyc-mr1-dev am: 6bcf0cdf37
am: 83af5b494a

Change-Id: If77543cca75a27667a7c3bc19a1bd7aebb225aa3

7 years agosetCarMode() only when car mode changes am: 399ddb0204
Annie Chin [Thu, 4 Aug 2016 22:21:48 +0000 (22:21 +0000)]
setCarMode() only when car mode changes am: 399ddb0204
am: 65e0be22ee

Change-Id: Ice8c3bc8bad153ab22419ad37634e373f20f4095

7 years agoMerge "setCarMode() only when car mode changes" into nyc-mr1-dev
Annie Chin [Thu, 4 Aug 2016 22:16:18 +0000 (22:16 +0000)]
Merge "setCarMode() only when car mode changes" into nyc-mr1-dev
am: 6bcf0cdf37

Change-Id: Id16d50f95d14b2bd4cb29df0443a08a40159a8e1

7 years agosetCarMode() only when car mode changes
Annie Chin [Thu, 4 Aug 2016 22:16:16 +0000 (22:16 +0000)]
setCarMode() only when car mode changes
am: 399ddb0204

Change-Id: I9f9378821d82082c9f97f7cda15b85ad3e239b90

7 years agoMerge "Don't crash system server when setting scheduler." into nyc-mr1-dev am: 2f917df4be
Ruben Brunk [Thu, 4 Aug 2016 22:14:38 +0000 (22:14 +0000)]
Merge "Don't crash system server when setting scheduler." into nyc-mr1-dev am: 2f917df4be
am: 90969ebf82

Change-Id: I631f8095b8bc8e9b08e74fafdb4280ac6fb46489

7 years agoDon't crash system server when setting scheduler. am: 29a4a9edb3
Ruben Brunk [Thu, 4 Aug 2016 22:14:35 +0000 (22:14 +0000)]
Don't crash system server when setting scheduler. am: 29a4a9edb3
am: 76f7a40780

Change-Id: I95e759b9d3ecb1976f16b32a7c5632157a2403cb

7 years agoMerge "Don't crash system server when setting scheduler." into nyc-mr1-dev
Ruben Brunk [Thu, 4 Aug 2016 22:08:55 +0000 (22:08 +0000)]
Merge "Don't crash system server when setting scheduler." into nyc-mr1-dev
am: 2f917df4be

Change-Id: I9d0e3f0b6c6d278134ceb26435f125b4b9052ae1

7 years agoDon't crash system server when setting scheduler.
Ruben Brunk [Thu, 4 Aug 2016 22:08:53 +0000 (22:08 +0000)]
Don't crash system server when setting scheduler.
am: 29a4a9edb3

Change-Id: Ibb96a4df03857c14be87162df7685130ad6ee9cc

7 years agoMerge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc...
Dianne Hackborn [Thu, 4 Aug 2016 22:08:20 +0000 (22:08 +0000)]
Merge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc-mr1-dev am: a96e7ac463
am: d037a7676e

Change-Id: If204836452efa017cf8885bf64a95718f10c2ab9

7 years agoMerge "setCarMode() only when car mode changes" into nyc-mr1-dev
Annie Chin [Thu, 4 Aug 2016 22:08:15 +0000 (22:08 +0000)]
Merge "setCarMode() only when car mode changes" into nyc-mr1-dev

7 years agoFix issue #30647973: stopForeground() doesn't remove notification am: 569a45871c
Dianne Hackborn [Thu, 4 Aug 2016 22:08:11 +0000 (22:08 +0000)]
Fix issue #30647973: stopForeground() doesn't remove notification am: 569a45871c
am: 52e15dcac5

Change-Id: I97c2486e87b0a2c8555678a115b4faabd1727422

7 years agoMerge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc...
Dianne Hackborn [Thu, 4 Aug 2016 22:02:50 +0000 (22:02 +0000)]
Merge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc-mr1-dev
am: a96e7ac463

Change-Id: Ie498778c0f353acfd29ef6003211d2726ad92d18

7 years agoFix issue #30647973: stopForeground() doesn't remove notification
Dianne Hackborn [Thu, 4 Aug 2016 22:02:44 +0000 (22:02 +0000)]
Fix issue #30647973: stopForeground() doesn't remove notification
am: 569a45871c

Change-Id: I7be431d8619f9154cdc433df048e6082495b5b5a

7 years agoMerge "Don't crash system server when setting scheduler." into nyc-mr1-dev
Ruben Brunk [Thu, 4 Aug 2016 21:59:50 +0000 (21:59 +0000)]
Merge "Don't crash system server when setting scheduler." into nyc-mr1-dev

7 years agoMerge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc...
Dianne Hackborn [Thu, 4 Aug 2016 21:56:24 +0000 (21:56 +0000)]
Merge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc-mr1-dev

7 years agoDon't crash system server when setting scheduler.
Ruben Brunk [Thu, 4 Aug 2016 21:50:25 +0000 (14:50 -0700)]
Don't crash system server when setting scheduler.

Bug: 30671326
Change-Id: I2f7913cd3cca052d5a653ff288459b0a6a69deda

7 years agoMerge "Fix bad index usage" am: 5cfe8a8315 am: 83272db445
Jakub Pawlowski [Thu, 4 Aug 2016 21:37:53 +0000 (21:37 +0000)]
Merge "Fix bad index usage" am: 5cfe8a8315 am: 83272db445
am: 4184bab40b

Change-Id: I0aaae022f62cde8fab51c258313b00764a0ce799

7 years agoMerge "Fix bad index usage" am: 5cfe8a8315
Andre Eisenbach [Thu, 4 Aug 2016 21:29:34 +0000 (21:29 +0000)]
Merge "Fix bad index usage" am: 5cfe8a8315
am: 83272db445

Change-Id: Ie20fd9eea99d4ec730e40045a693181da70ec786

7 years agoMerge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev...
Fyodor Kupolov [Thu, 4 Aug 2016 21:14:58 +0000 (21:14 +0000)]
Merge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev am: a4b89c054c
am: f5243ccef0

Change-Id: I968178c63c2a92ab3cbee2b7cde21a96adb989bd

7 years agoCorrectly handle a case when there are no preloaded apps am: 28ba2898ce
Fyodor Kupolov [Thu, 4 Aug 2016 21:14:50 +0000 (21:14 +0000)]
Correctly handle a case when there are no preloaded apps am: 28ba2898ce
am: 90e4b0dda3

Change-Id: I3b3fb471b5c601fa86a4f6f6d7e60eca6a622008

7 years agoMerge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev am...
Fyodor Kupolov [Thu, 4 Aug 2016 21:14:40 +0000 (21:14 +0000)]
Merge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev am: 65889f7e26
am: 7ddab82ecd

Change-Id: Iaec541c79a1ff9986bc31ef04baf50cc972d94d7

7 years agoUse Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE am: 49726b1115
Fyodor Kupolov [Thu, 4 Aug 2016 21:14:33 +0000 (21:14 +0000)]
Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE am: 49726b1115
am: d14db61721

Change-Id: Idcb2376b808672b40ce29205b83312e84a7b5315

7 years agoMerge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev
Fyodor Kupolov [Thu, 4 Aug 2016 21:09:22 +0000 (21:09 +0000)]
Merge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev
am: a4b89c054c

Change-Id: Icfdaf31ebdfc8a704121e8084565008efb58aa6e

7 years agoCorrectly handle a case when there are no preloaded apps
Fyodor Kupolov [Thu, 4 Aug 2016 21:09:20 +0000 (21:09 +0000)]
Correctly handle a case when there are no preloaded apps
am: 28ba2898ce

Change-Id: Iac5083931ff13a81bd631915d198872690252310

7 years agoMerge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev
Fyodor Kupolov [Thu, 4 Aug 2016 21:09:17 +0000 (21:09 +0000)]
Merge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev
am: 65889f7e26

Change-Id: I824e15909772c214cfc0136d29a70a0e80a0a868

7 years agoUse Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE
Fyodor Kupolov [Thu, 4 Aug 2016 21:09:15 +0000 (21:09 +0000)]
Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE
am: 49726b1115

Change-Id: I802090716f29485f8f73eb81a78b28d62989ae11

7 years agoFix issue #30647973: stopForeground() doesn't remove notification
Dianne Hackborn [Thu, 4 Aug 2016 21:00:22 +0000 (14:00 -0700)]
Fix issue #30647973: stopForeground() doesn't remove notification

Ignore the service that is actually trying to remove its notification.

Change-Id: I1293300cf2a4bea7c512df7b2242a18dcc25d1c6

7 years agoMerge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 20:53:55 +0000 (20:53 +0000)]
Merge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev

7 years agoMerge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev
Fyodor Kupolov [Thu, 4 Aug 2016 20:52:00 +0000 (20:52 +0000)]
Merge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev

7 years agoMerge "Add (corrected) usb power sink handling" into nyc-mr1-dev am: 7cee8be675
Philip P. Moltmann [Thu, 4 Aug 2016 20:47:23 +0000 (20:47 +0000)]
Merge "Add (corrected) usb power sink handling" into nyc-mr1-dev am: 7cee8be675
am: a6dab8b459

Change-Id: Icdb54c1d99118050d525114f17d579b986ed72af

7 years agoAdd (corrected) usb power sink handling am: 9ebf2a5683
Philip P. Moltmann [Thu, 4 Aug 2016 20:47:16 +0000 (20:47 +0000)]
Add (corrected) usb power sink handling am: 9ebf2a5683
am: 78ae5ebe58

Change-Id: Ib30210001b69e1d7ac9fe4a5598cc18dfea444f7

7 years agoMerge "Fix bad index usage"
Jakub Pawlowski [Thu, 4 Aug 2016 20:46:32 +0000 (20:46 +0000)]
Merge "Fix bad index usage"
am: 5cfe8a8315

Change-Id: I36807979de4f0f74f9dd3ef6f3b2a60e83346b0f

7 years agoMerge "Add (corrected) usb power sink handling" into nyc-mr1-dev
Philip P. Moltmann [Thu, 4 Aug 2016 20:38:40 +0000 (20:38 +0000)]
Merge "Add (corrected) usb power sink handling" into nyc-mr1-dev
am: 7cee8be675

Change-Id: Ie34e32f66df546619ff6c5553223d53d68e491c7

7 years agoAdd (corrected) usb power sink handling
Philip P. Moltmann [Thu, 4 Aug 2016 20:38:38 +0000 (20:38 +0000)]
Add (corrected) usb power sink handling
am: 9ebf2a5683

Change-Id: I2d7b2bb6be59dea8bd0fec74323f533e9dd7b4ab

7 years agoMerge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11...
Hemal Patel [Thu, 4 Aug 2016 20:37:32 +0000 (20:37 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11 am: ab35b73d1b am: eee5a7b846
am: c4988a5d4b

Change-Id: I34a184bc81410a65f128b9c1a6463b05d11db4aa

7 years agoDocs: Fixed info about spanning multiple columns am: 64e88cd296 am: 611f50d62f am...
Hemal Patel [Thu, 4 Aug 2016 20:37:26 +0000 (20:37 +0000)]
Docs: Fixed info about spanning multiple columns am: 64e88cd296 am: 611f50d62f am: e2088ef2ec
am: 5196848e13

Change-Id: Ibef325e080117702ea362fb5b22eedf460b70f1a

7 years agoAdd metrics event for Settings->Display->Ambient Display.
Doris Ling [Thu, 4 Aug 2016 20:21:53 +0000 (13:21 -0700)]
Add metrics event for Settings->Display->Ambient Display.

Bug: 29994493
Change-Id: I2eb71063db254cbe92511ca5cbe93b32c6b2c601

7 years agoMerge "Fix bad index usage"
Andre Eisenbach [Thu, 4 Aug 2016 20:20:02 +0000 (20:20 +0000)]
Merge "Fix bad index usage"

7 years agoFix bad index usage
Jakub Pawlowski [Thu, 4 Aug 2016 20:16:32 +0000 (13:16 -0700)]
Fix bad index usage

Bug: 27999121
Change-Id: Ie2ba6f71bbf6f789a3c1016ba2f0051b809ac87e

7 years agoMerge "Add (corrected) usb power sink handling" into nyc-mr1-dev
Philip P. Moltmann [Thu, 4 Aug 2016 20:08:32 +0000 (20:08 +0000)]
Merge "Add (corrected) usb power sink handling" into nyc-mr1-dev

7 years agoMerge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11...
Hemal Patel [Thu, 4 Aug 2016 20:04:47 +0000 (20:04 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11 am: ab35b73d1b
am: eee5a7b846

Change-Id: I6499315f9a6bb1c667f585c2f2e088506fbc8607

7 years agoMerge "Fixed year on copyright notice." into nyc-mr1-dev am: 7aed32ac3d
Felipe Leme [Thu, 4 Aug 2016 20:04:46 +0000 (20:04 +0000)]
Merge "Fixed year on copyright notice." into nyc-mr1-dev am: 7aed32ac3d
am: b8aef57bb3

Change-Id: Iaa5bb92c856890aedb6176fa3319806e246b03bb

7 years agoDocs: Fixed info about spanning multiple columns am: 64e88cd296 am: 611f50d62f
Hemal Patel [Thu, 4 Aug 2016 20:04:45 +0000 (20:04 +0000)]
Docs: Fixed info about spanning multiple columns am: 64e88cd296 am: 611f50d62f
am: e2088ef2ec

Change-Id: Ia6fc6b9bfe5a4e2be7c36357ac244ea1231c23bc

7 years agoFixed year on copyright notice. am: 6dd4e88210
Felipe Leme [Thu, 4 Aug 2016 20:04:42 +0000 (20:04 +0000)]
Fixed year on copyright notice. am: 6dd4e88210
am: 3a41597e35

Change-Id: I2b097fab798e834b2f05cdf77a2f9848a1917205

7 years agoMerge "Fixed year on copyright notice." into nyc-mr1-dev
Felipe Leme [Thu, 4 Aug 2016 19:55:07 +0000 (19:55 +0000)]
Merge "Fixed year on copyright notice." into nyc-mr1-dev
am: 7aed32ac3d

Change-Id: I41544cbe05505de72024470916acadb4ca65a8c0

7 years agoFixed year on copyright notice.
Felipe Leme [Thu, 4 Aug 2016 19:55:05 +0000 (19:55 +0000)]
Fixed year on copyright notice.
am: 6dd4e88210

Change-Id: I911b8caa9b29ba399e54159e4753d99c13e48a96

7 years agoMerge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11...
Hemal Patel [Thu, 4 Aug 2016 19:54:30 +0000 (19:54 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11 am: ab35b73d1b
am: 790aa26f8c

Change-Id: Ibe45d6d209990d1484421649a935125625bdb6a7

7 years agoDocs: Fixed info about spanning multiple columns am: 64e88cd296 am: 611f50d62f
Hemal Patel [Thu, 4 Aug 2016 19:54:28 +0000 (19:54 +0000)]
Docs: Fixed info about spanning multiple columns am: 64e88cd296 am: 611f50d62f
am: 43c0f74d0c

Change-Id: Id0f4c2ac25fe5fd6f1f5a9f022dcc33912808f4d

7 years agoMerge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11
Hemal Patel [Thu, 4 Aug 2016 19:48:26 +0000 (19:48 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11
am: ab35b73d1b

Change-Id: I006d4a5df9d850c3367d2a441fe86c320fee6c56

7 years agoDocs: Fixed info about spanning multiple columns am: 64e88cd296
Hemal Patel [Thu, 4 Aug 2016 19:48:19 +0000 (19:48 +0000)]
Docs: Fixed info about spanning multiple columns am: 64e88cd296
am: 611f50d62f

Change-Id: Ie4daa14c817f2781e06a6a0d1d68a245780580e8

7 years agoMerge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11
Hemal Patel [Thu, 4 Aug 2016 19:48:18 +0000 (19:48 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11
am: ab35b73d1b

Change-Id: I37c06297dce5822845d044c82f8e030d23ea850f

7 years agoDocs: Fixed info about spanning multiple columns am: 64e88cd296
Hemal Patel [Thu, 4 Aug 2016 19:48:15 +0000 (19:48 +0000)]
Docs: Fixed info about spanning multiple columns am: 64e88cd296
am: 611f50d62f

Change-Id: If7a6f08237c51b49ad4a550c25c020b8a7a5d0b3

7 years agoMerge "Fixed year on copyright notice." into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 19:45:25 +0000 (19:45 +0000)]
Merge "Fixed year on copyright notice." into nyc-mr1-dev

7 years agoMerge "Docs: Fixed info about spanning multiple columns" into nyc-docs
Hemal Patel [Thu, 4 Aug 2016 19:43:20 +0000 (19:43 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs
am: ca7eee3d11

Change-Id: I94b5abbf1d292a01ba439cafd80938f7fc92854d

7 years agoDocs: Fixed info about spanning multiple columns
Hemal Patel [Thu, 4 Aug 2016 19:43:18 +0000 (19:43 +0000)]
Docs: Fixed info about spanning multiple columns
am: 64e88cd296

Change-Id: I8c4219e946fddbfc023bbe77549cc12fc0b6bd3a

7 years agoMerge "ShortcutManager: Update foreground check." into nyc-mr1-dev am: 0fd8670fd5
Makoto Onuki [Thu, 4 Aug 2016 19:41:15 +0000 (19:41 +0000)]
Merge "ShortcutManager: Update foreground check." into nyc-mr1-dev am: 0fd8670fd5
am: bc90db84e9

Change-Id: I180bcd22beabc4d32cb8ba43707acdd5d14ade9a

7 years agoShortcutManager: Update foreground check. am: 33525d2f1a
Makoto Onuki [Thu, 4 Aug 2016 19:41:07 +0000 (19:41 +0000)]
ShortcutManager: Update foreground check. am: 33525d2f1a
am: 386fd915fc

Change-Id: Ib8c6d82fdc0218e46d30a4e85b23624882d63b1e

7 years agoMerge "Docs: Fixed info about spanning multiple columns" into nyc-docs
Hemal Patel [Thu, 4 Aug 2016 19:38:41 +0000 (19:38 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs

7 years agoMerge "ShortcutManager: Update foreground check." into nyc-mr1-dev
Makoto Onuki [Thu, 4 Aug 2016 19:35:46 +0000 (19:35 +0000)]
Merge "ShortcutManager: Update foreground check." into nyc-mr1-dev
am: 0fd8670fd5

Change-Id: Ice27469c4ac8e8338412fd7c2aa703d28c82a407

7 years agoShortcutManager: Update foreground check.
Makoto Onuki [Thu, 4 Aug 2016 19:35:41 +0000 (19:35 +0000)]
ShortcutManager: Update foreground check.
am: 33525d2f1a

Change-Id: I08769ba85f38c6768515450696d49a9755c698fb

7 years agoMerge "ShortcutManager: Update foreground check." into nyc-mr1-dev
Makoto Onuki [Thu, 4 Aug 2016 19:29:25 +0000 (19:29 +0000)]
Merge "ShortcutManager: Update foreground check." into nyc-mr1-dev

7 years agoDocs: Fixed typo in API Overview am: 844c43a904 am: 653b768997 am: 85e3fee7d3
Bert McMeen [Thu, 4 Aug 2016 18:57:09 +0000 (18:57 +0000)]
Docs: Fixed typo in API Overview am: 844c43a904 am: 653b768997 am: 85e3fee7d3
am: 6131417de6

Change-Id: I47d1dbdd0b1577232cd0059ab4ff64200f835844

7 years agoDocs: Fixed typo in API Overview am: 844c43a904 am: 653b768997
Bert McMeen [Thu, 4 Aug 2016 18:51:04 +0000 (18:51 +0000)]
Docs: Fixed typo in API Overview am: 844c43a904 am: 653b768997
am: 85e3fee7d3

Change-Id: I245b6ae214615105193d96ed17a401fc8c85d0ef

7 years agoMerge "only rate limit notification updates" into nyc-mr1-dev am: 118cb7d0f7
Chris Wren [Thu, 4 Aug 2016 18:50:56 +0000 (18:50 +0000)]
Merge "only rate limit notification updates" into nyc-mr1-dev am: 118cb7d0f7
am: e14487f42e

Change-Id: I48ecaf96c51c026f1be02cc91288b254c2ba7067

7 years agoonly rate limit notification updates am: a61f179c3d
Chris Wren [Thu, 4 Aug 2016 18:50:52 +0000 (18:50 +0000)]
only rate limit notification updates am: a61f179c3d
am: aefa21b65e

Change-Id: I9ac96d81c273139d08481185b829189ac01cac4d

7 years agoMerge "only rate limit notification updates" into nyc-mr1-dev
Chris Wren [Thu, 4 Aug 2016 18:40:10 +0000 (18:40 +0000)]
Merge "only rate limit notification updates" into nyc-mr1-dev
am: 118cb7d0f7

Change-Id: I62a76d56addbb86a02f75405c6fe8780022e9af4

7 years agoonly rate limit notification updates
Chris Wren [Thu, 4 Aug 2016 18:40:08 +0000 (18:40 +0000)]
only rate limit notification updates
am: a61f179c3d

Change-Id: I1b140eb26b2cb69c314bcc2f3543dbe3431290c3

7 years agoDocs: Fixed typo in API Overview am: 844c43a904 am: 653b768997
Bert McMeen [Thu, 4 Aug 2016 18:39:51 +0000 (18:39 +0000)]
Docs: Fixed typo in API Overview am: 844c43a904 am: 653b768997
am: a89c2719a3

Change-Id: Ic3ffadef8d74f9d4f7225a33775bbdb2ae86d9b8

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12 am: 3e0e7ef340
Bert McMeen [Thu, 4 Aug 2016 18:29:12 +0000 (18:29 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12 am: 3e0e7ef340
am: 3680329fcd

Change-Id: I7be511db3d3716151b7c7f8b6d397e2a9125fe29

7 years agoDocs: Fixed typo in API Overview am: f27ab3c126 am: ffe51968a5
Bert McMeen [Thu, 4 Aug 2016 18:29:07 +0000 (18:29 +0000)]
Docs: Fixed typo in API Overview am: f27ab3c126 am: ffe51968a5
am: b8ce3c613b

Change-Id: I898affbc837946c2bf735c0b29f49501646721c6

7 years agoDocs: Fixed typo in API Overview am: 844c43a904
Bert McMeen [Thu, 4 Aug 2016 18:28:47 +0000 (18:28 +0000)]
Docs: Fixed typo in API Overview am: 844c43a904
am: 653b768997

Change-Id: I56caec3330282d1acf9772d0ad21c27b31e2f602

7 years agoDocs: Fixed typo in API Overview am: 844c43a904
Bert McMeen [Thu, 4 Aug 2016 18:28:27 +0000 (18:28 +0000)]
Docs: Fixed typo in API Overview am: 844c43a904
am: 653b768997

Change-Id: I55ac0a468ff1f0748ffeaca1b99b0c6992cef676

7 years agoMerge "only rate limit notification updates" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 18:25:10 +0000 (18:25 +0000)]
Merge "only rate limit notification updates" into nyc-mr1-dev

7 years agoDocs: Fixed typo in API Overview
Bert McMeen [Thu, 4 Aug 2016 18:20:51 +0000 (18:20 +0000)]
Docs: Fixed typo in API Overview
am: 844c43a904

Change-Id: Ia855a58708afc4f12bae4b234b0f7ba10798aba4

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12
Bert McMeen [Thu, 4 Aug 2016 18:16:30 +0000 (18:16 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12
am: 3e0e7ef340

Change-Id: I5d1468bc889a0a6bacf65d3d1921a728bc71aa85

7 years agoDocs: Fixed typo in API Overview am: f27ab3c126
Bert McMeen [Thu, 4 Aug 2016 18:16:26 +0000 (18:16 +0000)]
Docs: Fixed typo in API Overview am: f27ab3c126
am: ffe51968a5

Change-Id: I91894d0898de8e1fbe5bfbcbf6c38e76660ddba4

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12
Bert McMeen [Thu, 4 Aug 2016 18:14:53 +0000 (18:14 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12
am: 7000a4d1ba

Change-Id: I6b05bba46ed83f240bba4abe3040fee0d0cee782

7 years agoDocs: Fixed typo in API Overview am: f27ab3c126
Bert McMeen [Thu, 4 Aug 2016 18:14:51 +0000 (18:14 +0000)]
Docs: Fixed typo in API Overview am: f27ab3c126
am: aea8d109c4

Change-Id: Ib5a4700803f69f7de1b328ca24811550449ceb9f

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev
Bert McMeen [Thu, 4 Aug 2016 18:09:25 +0000 (18:09 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
am: 62faea4f12

Change-Id: I29a6d5c083e527643cea4da8e666ba363040364e

7 years agoDocs: Fixed typo in API Overview
Bert McMeen [Thu, 4 Aug 2016 18:09:22 +0000 (18:09 +0000)]
Docs: Fixed typo in API Overview
am: f27ab3c126

Change-Id: I64dced0229d1017f30a34790a8adfb36ed9e3d67

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev
Bert McMeen [Thu, 4 Aug 2016 18:08:50 +0000 (18:08 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
am: 62faea4f12

Change-Id: I849e6e3fed25bf7977263b1f57473dbaf544eb78

7 years agoDocs: Fixed typo in API Overview
Bert McMeen [Thu, 4 Aug 2016 18:08:43 +0000 (18:08 +0000)]
Docs: Fixed typo in API Overview
am: f27ab3c126

Change-Id: I08ed3c58d13fbeb93e331897641977633a6b807e

7 years agoMerge "We don't need to wait to pin the camera app." into nyc-mr1-dev am: b0da868b63
Jeff Sharkey [Thu, 4 Aug 2016 18:08:38 +0000 (18:08 +0000)]
Merge "We don't need to wait to pin the camera app." into nyc-mr1-dev am: b0da868b63
am: f2643a857b

Change-Id: I4c191eed2c430ae1ddff5a465160d3e42b7e398a

7 years agoWe don't need to wait to pin the camera app. am: 847bd85fc1
Jeff Sharkey [Thu, 4 Aug 2016 18:08:28 +0000 (18:08 +0000)]
We don't need to wait to pin the camera app. am: 847bd85fc1
am: a2c04feeb3

Change-Id: Ie7ed6b2a75efaec467af00614648c7592c40e0da

7 years agoDocs: Fixed typo in API Overview
Bert McMeen [Tue, 2 Aug 2016 20:45:24 +0000 (13:45 -0700)]
Docs: Fixed typo in API Overview

Bug: 30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
(cherry picked from commit f27ab3c12625f34a4221477001a603390b505e65)