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

Jonathan Basseri [Thu, 26 May 2016 23:24:45 +0000 (23:24 +0000)]

Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb
am: 531cd8724c

* commit '531cd8724cad56e2a141dbe5acbe283372c21de4':

Change-Id: I60f30d1169e65fde080d398a06d2b543a0278238

commit | commitdiff | tree

Jonathan Basseri [Thu, 26 May 2016 23:13:17 +0000 (23:13 +0000)]

resolve merge conflicts of 4c04097 to nyc-mr1-dev
am: 04c35e78db

* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
Change how TelephonyManager handles subscriptions.

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d

commit | commitdiff | tree

Jonathan Basseri [Thu, 26 May 2016 18:41:17 +0000 (11:41 -0700)]

resolve merge conflicts of 4c04097 to nyc-mr1-dev

Change-Id: I256514588af20985108f72a5e204811904f87c9c

commit | commitdiff | tree

Doris Ling [Thu, 26 May 2016 17:51:23 +0000 (17:51 +0000)]

Merge "Added new action for gesture settings." into nyc-mr1-dev
am: ce8e88aaab

* commit 'ce8e88aaabdca9572a17e59e4d54db055a11e10a':
Added new action for gesture settings.

Change-Id: I0756549196b98e1abeece0af3ab4956204c05e9d

commit | commitdiff | tree

Bill Yi [Thu, 26 May 2016 17:51:19 +0000 (17:51 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 62d1f54d04 -s ours

* commit '62d1f54d0473261909dc515878fe23b64d279d1b':
Import translations. DO NOT MERGE

Change-Id: Ic7bb1288dc08b4646a643f62f1aebf7f5314baed

commit | commitdiff | tree

Bill Yi [Thu, 26 May 2016 17:33:40 +0000 (17:33 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 06b1de25af -s ours

* commit '06b1de25afb1a2bfce1cfc38a88584efc7d73c2f':
Import translations. DO NOT MERGE

Change-Id: Ic2199da26da3980ac74c09b92b6b39a83ec9e133

commit | commitdiff | tree

Doris Ling [Thu, 26 May 2016 17:20:53 +0000 (17:20 +0000)]

Merge "Added new action for gesture settings." into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 26 May 2016 17:07:23 +0000 (17:07 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 26 May 2016 16:55:57 +0000 (16:55 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 16:15:27 +0000 (16:15 +0000)]

Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: f8969b233c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ji Yang [Thu, 26 May 2016 16:12:57 +0000 (16:12 +0000)]

Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
am: f8969b233c

* commit 'f8969b233c1637d4945e4fe2c3c9a35fef5019ed':
Rename carrier messaging API constant.

Change-Id: I770c85c4036de650f78bb0bdb57ea610049e9511

commit | commitdiff | tree

Jonathan Basseri [Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)]

Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd

commit | commitdiff | tree

Ji Yang [Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)]

Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
am: e6c6ca417d

* commit 'e6c6ca417da6f62de4bdebd7b380f12b751a08b7':
Rename carrier messaging API constant.

Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a

commit | commitdiff | tree

Ji Yang [Thu, 26 May 2016 15:54:38 +0000 (15:54 +0000)]

Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e

commit | commitdiff | tree

Ji Yang [Thu, 26 May 2016 15:54:27 +0000 (15:54 +0000)]

commit | commitdiff | tree

Jonathan Basseri [Thu, 26 May 2016 15:50:03 +0000 (15:50 +0000)]

Merge "Change how TelephonyManager handles subscriptions." into nyc-dev

commit | commitdiff | tree

Ji Yang [Thu, 26 May 2016 15:40:11 +0000 (15:40 +0000)]

Merge "Rename carrier messaging API constant." into nyc-dev

commit | commitdiff | tree

Michael Wright [Thu, 26 May 2016 15:02:50 +0000 (15:02 +0000)]

Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
am: 28984d4d80

* commit '28984d4d80affa52324f4c17caae30c6bc3bc3ab':

Change-Id: I4cd9b6ffa87be709845c7531cacac10978664f4e

commit | commitdiff | tree

Michael Wright [Thu, 26 May 2016 14:51:30 +0000 (14:51 +0000)]

Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
am: 4f6ae7bbaa

* commit '4f6ae7bbaa4654e14d70e9fa503ceb713c90c342':
DO NOT MERGE Remove Pointer Capture API

Change-Id: Ieceb1c9248bfc618ed1c70821d4cf746128bc679

commit | commitdiff | tree

Michael Wright [Thu, 26 May 2016 14:39:03 +0000 (14:39 +0000)]

Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
DO NOT MERGE Remove Pointer Capture API

Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7

commit | commitdiff | tree

Michael Wright [Thu, 26 May 2016 14:38:56 +0000 (14:38 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 14:37:23 +0000 (14:37 +0000)]

Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 9b22e5b4e8" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 14:37:12 +0000 (14:37 +0000)]

Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 14:37:06 +0000 (14:37 +0000)]

Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 am: 56181175a7" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:35:45 +0000 (14:35 +0000)]

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4
am: 9b22e5b4e8

* commit '9b22e5b4e80e9daadf2af6430607016839e1909c':
Add resetKeyStore() in LockSettingsService

Change-Id: Icf0caad400e9ab8fd04af6e79f049db406dce4a7

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:35:30 +0000 (14:35 +0000)]

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4
am: 754ddca748

* commit '754ddca748d7a8d3e55f4d90c07ca140a7ed312d':
Add resetKeyStore() in LockSettingsService

Change-Id: Ic5d0e880c85754a4c198597c80c7eacfa1b1516a

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:34:30 +0000 (14:34 +0000)]

Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2
am: 56181175a7

* commit '56181175a7717dc1d8ea58cdd2ecdcb252119304':
Store work lock type even it uses unified lock

Change-Id: I0e2c41d37e25c463c60de8d8f6196b2612550b06

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:34:01 +0000 (14:34 +0000)]

Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2
am: 7c46f928f4

* commit '7c46f928f4ef3998f16084cb5eeb732c0d2b21e7':
Store work lock type even it uses unified lock

Change-Id: I944565b7120f1bb6440a9f0a51831b326564ce05

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)]

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am: 1cb6f9d8a4

* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService

Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)]

commit | commitdiff | tree

Michael Wright [Thu, 26 May 2016 14:03:46 +0000 (14:03 +0000)]

Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:02:12 +0000 (14:02 +0000)]

Merge "Store work lock type even it uses unified lock" into nyc-dev
am: 610fb8a3f2

* commit '610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
Store work lock type even it uses unified lock

Change-Id: I98c209ec1c3fd63d2abd597f1f38d9fc86dd5275

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 14:02:06 +0000 (14:02 +0000)]

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]

Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev

commit | commitdiff | tree

Ricky Wai [Thu, 26 May 2016 13:46:11 +0000 (13:46 +0000)]

Merge "Store work lock type even it uses unified lock" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 11:16:59 +0000 (11:16 +0000)]

Merge "Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 am: eb6ce93432" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Nicolas Prévot [Thu, 26 May 2016 11:16:33 +0000 (11:16 +0000)]

Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9
am: eb6ce93432

* commit 'eb6ce934323c487a36426cc62b38a1439b2d12df':
Use correct user id when checking uri grants for notification.

Change-Id: I9e5ae930570f6a7720d597e8642c8a91ad37e348

commit | commitdiff | tree

Nicolas Prévot [Thu, 26 May 2016 11:16:24 +0000 (11:16 +0000)]

Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9
am: 37b0156d21

* commit '37b0156d21d05f2f00cdbcd0374be73f79f3c900':
Use correct user id when checking uri grants for notification.

Change-Id: I2e4117c532749ba84df3baa297a26d44f54c2ab4

commit | commitdiff | tree

Nicolas Prevot [Thu, 26 May 2016 11:06:30 +0000 (11:06 +0000)]

Merge "Use correct user id when checking uri grants for notification." into nyc-dev
am: 19d34821b9

* commit '19d34821b9c0a74d4269fff0bee87a7f486e1603':
Use correct user id when checking uri grants for notification.

Change-Id: I13aff9bc96e465e5a18c8ec44c3c709bc221a8b1

commit | commitdiff | tree

Nicolas Prevot [Thu, 26 May 2016 11:06:30 +0000 (11:06 +0000)]

commit | commitdiff | tree

Nicolas Prévot [Thu, 26 May 2016 10:37:31 +0000 (10:37 +0000)]

Merge "Use correct user id when checking uri grants for notification." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 09:18:12 +0000 (09:18 +0000)]

Merge "Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e am: 5ede03bfd5" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Yi Kong [Thu, 26 May 2016 09:16:31 +0000 (09:16 +0000)]

Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e
am: 8ea65f2264

* commit '8ea65f22640576de4bd64ac4abf490bf62e65320':
Docs: Update content license page to include Javadocs licenses

Change-Id: I848e1e74115ad542c9c6ae4517ac645742d56315

commit | commitdiff | tree

Yi Kong [Thu, 26 May 2016 09:16:25 +0000 (09:16 +0000)]

Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am: 03a1314f2e
am: 5ede03bfd5

* commit '5ede03bfd54875cf7d54706306a801d798c81af0':
Docs: Update content license page to include Javadocs licenses

Change-Id: I87ba582c31e6c0dced6523fd89cad0e28ec58a9f

commit | commitdiff | tree

Yi Kong [Thu, 26 May 2016 09:09:08 +0000 (09:09 +0000)]

Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
am: 03a1314f2e

* commit '03a1314f2e9040d48488c7cf38dba273ba669284':
Docs: Update content license page to include Javadocs licenses

Change-Id: Id2217b3e60ac0c5325f2fb1eb3c2fc19445d0577

commit | commitdiff | tree

Yi Kong [Thu, 26 May 2016 09:09:02 +0000 (09:09 +0000)]

commit | commitdiff | tree

Yi Kong [Thu, 26 May 2016 08:54:56 +0000 (08:54 +0000)]

Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev

commit | commitdiff | tree

Bill Yi [Thu, 26 May 2016 08:00:46 +0000 (01:00 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 06:42:01 +0000 (06:42 +0000)]

Merge "Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7 am: 304519b9b9" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Lajos Molnar [Thu, 26 May 2016 06:41:27 +0000 (06:41 +0000)]

Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7
am: 304519b9b9

* commit '304519b9b949157827425a5467496a321e79c3a2':
media: check profile, level and bitrate for isFormatSupported

Change-Id: I69f3066b451ab238caf5421bd12131d3648012ce

commit | commitdiff | tree

Lajos Molnar [Thu, 26 May 2016 06:41:17 +0000 (06:41 +0000)]

Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am: 40585321d7
am: e3d6b69562

* commit 'e3d6b6956274a2b6036a60f677e1a98c5ec3012e':
media: check profile, level and bitrate for isFormatSupported

Change-Id: I23379a661cfb1cc6c072ac859b4cc0a1078a5e2f

commit | commitdiff | tree

Lajos Molnar [Thu, 26 May 2016 06:27:34 +0000 (06:27 +0000)]

Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
am: 40585321d7

* commit '40585321d7b036ce7f609fbf10e8730deb1ad456':
media: check profile, level and bitrate for isFormatSupported

Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a

commit | commitdiff | tree

Lajos Molnar [Thu, 26 May 2016 06:27:26 +0000 (06:27 +0000)]

commit | commitdiff | tree

Lajos Molnar [Thu, 26 May 2016 06:14:03 +0000 (06:14 +0000)]

Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 06:07:23 +0000 (06:07 +0000)]

Merge "Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5 am: 970446d0ac" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 06:06:49 +0000 (06:06 +0000)]

Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5
am: 74083c0b6b

* commit '74083c0b6b1a171a1b8ad0ba7db708fc2f22bef3':
Remove spurious url reference.

Change-Id: I220eafc9d31dc9fe3e71fb30ea736cf02ae96cc1

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 06:06:42 +0000 (06:06 +0000)]

Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb am: a283dabdf5
am: 970446d0ac

* commit '970446d0acdb6668f1d79ea08534d6c90298c022':
Remove spurious url reference.

Change-Id: I496a2b01ea84f38276ac4ec09eca92a3e6b968fd

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 05:53:48 +0000 (05:53 +0000)]

Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb
am: a283dabdf5

* commit 'a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
Remove spurious url reference.

Change-Id: I3d702473090d1fdf9320d359dc0d6feb4eba47c6

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 05:53:44 +0000 (05:53 +0000)]

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 05:44:29 +0000 (05:44 +0000)]

Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467
am: 1cf99365cb

* commit '1cf99365cb98174bd4300c7f0c799e94f6aab907':
Remove spurious url reference.

Change-Id: I744e556ebdb729314542dd9115346d42daf63e09

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 05:35:46 +0000 (05:35 +0000)]

Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a
am: a7c0788467

* commit 'a7c0788467d865e72ddbaa5862382d8ecc164039':
Remove spurious url reference.

Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 05:18:06 +0000 (05:18 +0000)]

Merge "Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca am: c8f0324f15" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 05:18:00 +0000 (05:18 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 05:17:54 +0000 (05:17 +0000)]

Merge "Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f am: f075d977a3" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 05:17:21 +0000 (05:17 +0000)]

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca
am: c8f0324f15

* commit 'c8f0324f15b16c928095f73f010abd4bf6b14a71':
Track changes to network security config manifest configuration

Change-Id: Iea73306dad56f48dbd5d3ad46e7d6ed58ac96ec7

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 05:17:12 +0000 (05:17 +0000)]

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca
am: 62ac808954

* commit '62ac808954617a30512abe0cd07068bdbae5a314':
Track changes to network security config manifest configuration

Change-Id: Ib3190c6b57a49c2984e25e3b539589649bddb002

commit | commitdiff | tree

Joe Fernandez [Thu, 26 May 2016 05:17:12 +0000 (05:17 +0000)]

Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f
am: f075d977a3

* commit 'f075d977a38af54f8b1890f40b2aa253923d4a89':
docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie009ea200c841fb38aa6b738aa12cb9ab7d84374

commit | commitdiff | tree

Joe Fernandez [Thu, 26 May 2016 05:17:03 +0000 (05:17 +0000)]

Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 am: 68fb46153f
am: 67f2e2cc90

* commit '67f2e2cc908635307d824772aada7a6db42fe927':
docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: I204755f4797c768954b330b374ae3fabe5a97de2

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 05:17:01 +0000 (05:17 +0000)]

Merge "Remove spurious url reference." into mnc-mr-docs
am: 1ed701493a

* commit '1ed701493a6363c58b86de8dac600fca990a131a':
Remove spurious url reference.

Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 05:03:24 +0000 (05:03 +0000)]

Merge "Remove spurious url reference." into mnc-mr-docs

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 05:00:35 +0000 (05:00 +0000)]

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5
am: 86bceb87ca

* commit '86bceb87ca8177200977024f4757edaf1233d4be':
Track changes to network security config manifest configuration

Change-Id: Id4b8b2a06cd2cbebcd47964e05157199c9cf9b31

commit | commitdiff | tree

Joe Fernandez [Thu, 26 May 2016 05:00:12 +0000 (05:00 +0000)]

Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4
am: 68fb46153f

* commit '68fb46153f8649e2d4027a5e79cfc1786764a746':
docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: I7ff0d7995f26d9e47609322f91a9ac71c9b2b80d

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 04:59:41 +0000 (04:59 +0000)]

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5
am: 86bceb87ca

* commit '86bceb87ca8177200977024f4757edaf1233d4be':
Track changes to network security config manifest configuration

Change-Id: Ibd6b8e86ec89c3ba0e8c84289255eaef23dcc3b3

commit | commitdiff | tree

Joe Fernandez [Thu, 26 May 2016 04:59:32 +0000 (04:59 +0000)]

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 04:47:44 +0000 (04:47 +0000)]

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571
am: 11b56641e5

* commit '11b56641e5e466f5ca14bd118e819c3f04820d38':
Track changes to network security config manifest configuration

Change-Id: I25e463154d084223dbafdf3e2ab99bfdb52769fb

commit | commitdiff | tree

Joe Fernandez [Thu, 26 May 2016 04:47:34 +0000 (04:47 +0000)]

Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048
am: 1a045584d4

* commit '1a045584d44030947793f2a48953ce54ff2df0c6':
docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 04:37:17 +0000 (04:37 +0000)]

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e

commit | commitdiff | tree

Joe Fernandez [Thu, 26 May 2016 04:37:09 +0000 (04:37 +0000)]

Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
am: 9e823c7048

* commit '9e823c7048bce9373fd5ccf10003b2eb05175b2b':
docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 04:26:32 +0000 (04:26 +0000)]

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs

commit | commitdiff | tree

Joe Fernandez [Thu, 26 May 2016 04:26:24 +0000 (04:26 +0000)]

Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 04:26:11 +0000 (04:26 +0000)]

Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
am: c0f99aebdc

* commit 'c0f99aebdc7c803600e12cbe0d940219069eb066':
Track changes to network security config manifest configuration

Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 04:18:13 +0000 (04:18 +0000)]

Merge "Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: 005ef10518" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Seigo Nonaka [Thu, 26 May 2016 04:17:47 +0000 (04:17 +0000)]

Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657
am: 005ef10518

* commit '005ef10518adb9768ad6569f0c6b42db949083d4':
Fix system locale propagation during user creation.

Change-Id: Ibbfebbfb28321bbd7275461b9e8d112577e05620

commit | commitdiff | tree

Seigo Nonaka [Thu, 26 May 2016 04:17:39 +0000 (04:17 +0000)]

Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657
am: b03e7217f3

* commit 'b03e7217f3fa3144f69119a4e109cce934d6065a':
Fix system locale propagation during user creation.

Change-Id: I6955bad489926525f6b50709bcf14b829ca9392d

commit | commitdiff | tree

Chad Brubaker [Thu, 26 May 2016 04:09:39 +0000 (04:09 +0000)]

Merge "Track changes to network security config manifest configuration" into mnc-mr-docs

commit | commitdiff | tree

Seigo Nonaka [Thu, 26 May 2016 04:07:40 +0000 (04:07 +0000)]

Merge "Fix system locale propagation during user creation." into nyc-dev
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
Fix system locale propagation during user creation.

Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf

commit | commitdiff | tree

Seigo Nonaka [Thu, 26 May 2016 04:07:33 +0000 (04:07 +0000)]

commit | commitdiff | tree

Seigo Nonaka [Thu, 26 May 2016 03:51:38 +0000 (03:51 +0000)]

Merge "Fix system locale propagation during user creation." into nyc-dev

commit | commitdiff | tree

Dirk Dougherty [Thu, 26 May 2016 03:29:59 +0000 (20:29 -0700)]

Remove spurious url reference.

Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 02:48:45 +0000 (02:48 +0000)]

Merge "docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e am: 6e73a12804" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Trevor Johns [Thu, 26 May 2016 02:48:16 +0000 (02:48 +0000)]

docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e
am: 6e73a12804

* commit '6e73a12804276d95c96fc66a80b2693a9bf35652':
docs: Fix broken link in Volley training

Change-Id: I60c8e6c9c6a26fafe290105f9d64061d694ecc1b

commit | commitdiff | tree

Trevor Johns [Thu, 26 May 2016 02:48:14 +0000 (02:48 +0000)]

docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e
am: e135e9b1b7

* commit 'e135e9b1b7060b618febf35082d42148e8e38afb':
docs: Fix broken link in Volley training

Change-Id: I5e0a61ee98e45d71b5d796f0fa1418b8ddab87f2

commit | commitdiff | tree

Trevor Johns [Thu, 26 May 2016 02:36:42 +0000 (02:36 +0000)]

docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2
am: 5513b6776e

* commit '5513b6776e0b00fd0444cf4f964451d0ef61a511':
docs: Fix broken link in Volley training

Change-Id: Ia030a066b44dfd842a8ea411001dbf454003fb20

commit | commitdiff | tree

Trevor Johns [Thu, 26 May 2016 02:36:37 +0000 (02:36 +0000)]

commit | commitdiff | tree

Trevor Johns [Thu, 26 May 2016 02:19:23 +0000 (02:19 +0000)]

docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e
am: 46c1d5a5d2

* commit '46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
docs: Fix broken link in Volley training

Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 02:18:46 +0000 (02:18 +0000)]

Merge "Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: ade0bce32a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Thu, 26 May 2016 02:18:05 +0000 (02:18 +0000)]

Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a
am: ade0bce32a

* commit 'ade0bce32ae9dbacccf8d75695cda99b56a014f3':
Use app's best locale if they override LocaleList

Change-Id: Ib573235d174892c714e6864d8f34ac3a909b2d1c

commit | commitdiff | tree

Adam Lesinski [Thu, 26 May 2016 02:10:48 +0000 (02:10 +0000)]

Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a
am: fbdf46f663

* commit 'fbdf46f66323e80d4e90e926d0f199b64bf71f14':
Use app's best locale if they override LocaleList

Change-Id: I99bb920efcc7befa2817bed3a7fb7a0bcad4a13e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 May 2016 02:01:48 +0000 (02:01 +0000)]

Merge "Merge "N is API 24" into nyc-dev am: bc983c4431 am: 528a5bd466" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Powell [Thu, 26 May 2016 01:59:49 +0000 (01:59 +0000)]

Merge "N is API 24" into nyc-dev am: bc983c4431
am: 528a5bd466

* commit '528a5bd466a18f2d955ae364b0e8600b74fa790f':
N is API 24

Change-Id: I3f3e4c597924bc5b5f47c3c029ee52e147c61b34