OSDN Git Service
TreeHugger Robot [Thu, 16 Jun 2016 10:00:04 +0000 (10:00 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 16 Jun 2016 09:54:35 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 16 Jun 2016 07:43:09 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia8af83bfc4b244c698a79aee032d63b0e36b6da1
Auto-generated-cl: translation import
Keisuke Kuroyanagi [Thu, 16 Jun 2016 06:01:05 +0000 (06:01 +0000)]
Merge "Cleanup Editor.java."
Selim Cinek [Thu, 16 Jun 2016 04:35:51 +0000 (04:35 +0000)]
Merge \"Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc-dev am:
c1720dce1b am:
447ee99755\" into nyc-mr1-dev-plus-aosp
am:
39aa6dc11f
Change-Id: Ib1307bef33373299dc9d8b36144ab300d518e3fd
Selim Cinek [Thu, 16 Jun 2016 04:35:48 +0000 (04:35 +0000)]
Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc-dev am:
c1720dce1b am:
0630d92064
am:
7a0051b68f
Change-Id: Ia1052c236a6dd85e694992db4f7515bab6c78764
Android Build Merger (Role) [Thu, 16 Jun 2016 04:31:04 +0000 (04:31 +0000)]
Merge "Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am:
c1720dce1b am:
447ee99755" into nyc-mr1-dev-plus-aosp
Selim Cinek [Thu, 16 Jun 2016 04:30:35 +0000 (04:30 +0000)]
Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am:
c1720dce1b
am:
447ee99755
Change-Id: I92627b1729d042c41b72f5449831d3e8b7b29b0b
Selim Cinek [Thu, 16 Jun 2016 04:30:32 +0000 (04:30 +0000)]
Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am:
c1720dce1b
am:
0630d92064
Change-Id: I01afc02fe75b0ae7223e9deba6355ed00961faaa
Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am:
c1720dce1b
Change-Id: I14674254eb79fef58e4dcb1a8d7ecaab24831691
Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am:
c1720dce1b
Change-Id: I25bd41f1307233bba14067952086ca7be3118505
TreeHugger Robot [Thu, 16 Jun 2016 04:19:47 +0000 (04:19 +0000)]
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 02:28:09 +0000 (19:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaca8556682b9b2ac9f7f2c9513eb1f256963af93
Auto-generated-cl: translation import
Ruben Brunk [Thu, 16 Jun 2016 01:52:41 +0000 (01:52 +0000)]
Merge \"Remove coarse location pre-grant for preinstalled VrListenerServices. am:
d430f1a0be am:
268a22feb6\" into nyc-mr1-dev-plus-aosp
am:
698d5c573c
Change-Id: I30c69ffe3b190b96284aecdedb5013fdcf172396
Ruben Brunk [Thu, 16 Jun 2016 01:52:38 +0000 (01:52 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices. am:
d430f1a0be am:
c3e651cb52
am:
f11683b6da
Change-Id: I38de7ce2c26e1c4f2366752ffad448b58512ab95
Android Build Merger (Role) [Thu, 16 Jun 2016 01:43:12 +0000 (01:43 +0000)]
Merge "Remove coarse location pre-grant for preinstalled VrListenerServices. am:
d430f1a0be am:
268a22feb6" into nyc-mr1-dev-plus-aosp
Ruben Brunk [Thu, 16 Jun 2016 01:42:48 +0000 (01:42 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices. am:
d430f1a0be
am:
268a22feb6
Change-Id: Ib006f8deafe32c69ffab5360c8bb6d4a18f9f9a8
Ruben Brunk [Thu, 16 Jun 2016 01:42:33 +0000 (01:42 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices. am:
d430f1a0be
am:
c3e651cb52
Change-Id: I395fff24aac498d85703cebcba3c066dff23a19a
Ruben Brunk [Thu, 16 Jun 2016 01:37:29 +0000 (01:37 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
am:
d430f1a0be
Change-Id: I9501d2926246f5f83ef24a5105323d8e43807608
Ruben Brunk [Thu, 16 Jun 2016 01:37:26 +0000 (01:37 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
am:
d430f1a0be
Change-Id: Ibd5f32c4afe864167411c3876e5ab0cc4de33293
Ruben Brunk [Thu, 16 Jun 2016 01:04:26 +0000 (01:04 +0000)]
Merge \"Merge \\\"Fix VR transition for display on/off sequence.\\\" into nyc-dev am:
931a7c03e0 am:
336a7cb9b5\" into nyc-mr1-dev-plus-aosp
am:
e823f9ea26
Change-Id: I9f84dd9b83de294dbafc507db6d9c280d8cfb1a7
Mihai Niță [Thu, 16 Jun 2016 01:04:23 +0000 (01:04 +0000)]
Merge \"Merge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into nyc-dev am:
c8c9afeacb am:
d80a8e8fe7\" into nyc-mr1-dev-plus-aosp
am:
314e4f73d8
Change-Id: Idc50ec1acd07bcf4a363a1c5d13d6de92293f6b3
Ruben Brunk [Thu, 16 Jun 2016 01:04:20 +0000 (01:04 +0000)]
Merge \\\"Fix VR transition for display on/off sequence.\\\" into nyc-dev am:
931a7c03e0 am:
fafe810a61
am:
0dc7b8af98
Change-Id: Ib4afffdb096401999669887eacf7eeba6078587c
Mihai Nita [Thu, 16 Jun 2016 01:04:17 +0000 (01:04 +0000)]
Merge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into nyc-dev am:
c8c9afeacb am:
44080ac5bf
am:
ba183ff406
Change-Id: Ic812636f47ec7fd348e00d2d2bb7df883e5ab8cd
Ruben Brunk [Thu, 16 Jun 2016 00:55:41 +0000 (17:55 -0700)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
Bug:
28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6
Android Build Merger (Role) [Thu, 16 Jun 2016 00:43:14 +0000 (00:43 +0000)]
Merge "Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am:
931a7c03e0 am:
336a7cb9b5" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 16 Jun 2016 00:43:01 +0000 (00:43 +0000)]
Merge "Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am:
c8c9afeacb am:
d80a8e8fe7" into nyc-mr1-dev-plus-aosp
Ruben Brunk [Thu, 16 Jun 2016 00:42:24 +0000 (00:42 +0000)]
Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am:
931a7c03e0
am:
336a7cb9b5
Change-Id: I47d538ee1128a00cab1a7a2e375edf5d9c519cf7
Mihai Niță [Thu, 16 Jun 2016 00:42:23 +0000 (00:42 +0000)]
Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am:
c8c9afeacb
am:
d80a8e8fe7
Change-Id: Ia714522456f1526db276046cb12973df7193b102
Ruben Brunk [Thu, 16 Jun 2016 00:42:03 +0000 (00:42 +0000)]
Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am:
931a7c03e0
am:
fafe810a61
Change-Id: I9e1e7ed21669000c664c3a59c681bf706c574907
Mihai Niță [Thu, 16 Jun 2016 00:41:59 +0000 (00:41 +0000)]
Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am:
c8c9afeacb
am:
44080ac5bf
Change-Id: Ib9f1021c18187364d23058fdff39405a00402efe
Amith Yamasani [Thu, 16 Jun 2016 00:38:32 +0000 (00:38 +0000)]
Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am:
4f2b1b455e am:
c5ffdb9ee4
am:
5d016b2335
Change-Id: Id94501454ccecfa5dba5359aa224be55281c444d
Amith Yamasani [Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)]
Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am:
4f2b1b455e am:
bf1301f542
am:
80027e9d93
Change-Id: I9f6040fb97c55aa5e01d00d5221a2c678227dab2
Ruben Brunk [Thu, 16 Jun 2016 00:38:05 +0000 (00:38 +0000)]
Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am:
931a7c03e0
Change-Id: I406724ea21cd7cfde2be6aa922ac636c7b7f23a8
Mihai Nita [Thu, 16 Jun 2016 00:37:54 +0000 (00:37 +0000)]
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am:
c8c9afeacb
Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25
Ruben Brunk [Thu, 16 Jun 2016 00:34:32 +0000 (00:34 +0000)]
Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am:
931a7c03e0
Change-Id: I70301a77d89271e74e69efb92f340f1dbf6b3ca8
Mihai Nita [Thu, 16 Jun 2016 00:34:30 +0000 (00:34 +0000)]
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am:
c8c9afeacb
Change-Id: Iaa4df1af4a18ad0bc4e99a5bd47aa8f6c1357e50
Amith Yamasani [Thu, 16 Jun 2016 00:33:25 +0000 (00:33 +0000)]
Merge \\"More thorough cleansing of expired users\\" into nyc-dev am:
4f2b1b455e
am:
c5ffdb9ee4
Change-Id: I8c7bec8db8d0f9271e965fcef079e778b04409e7
Ruben Brunk [Thu, 16 Jun 2016 00:29:31 +0000 (00:29 +0000)]
Merge "Fix VR transition for display on/off sequence." into nyc-dev
Amith Yamasani [Thu, 16 Jun 2016 00:28:45 +0000 (00:28 +0000)]
Merge \\"More thorough cleansing of expired users\\" into nyc-dev am:
4f2b1b455e
am:
bf1301f542
Change-Id: Ie4250ddaa0175ff25a85abdbaa59a31b61003752
Mihai Niță [Thu, 16 Jun 2016 00:28:35 +0000 (00:28 +0000)]
Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev
Ruben Brunk [Thu, 16 Jun 2016 00:08:35 +0000 (17:08 -0700)]
Fix VR transition for display on/off sequence.
- Ensure VR transition has been applied before display power
off sequence.
Bug:
29364940
Change-Id: I1224ac653d466919cb418e5c357a748606c4fd7d
Amith Yamasani [Thu, 16 Jun 2016 00:24:17 +0000 (00:24 +0000)]
Merge \"More thorough cleansing of expired users\" into nyc-dev
am:
4f2b1b455e
Change-Id: Ia5388c84b89cdabefe666b483cebe40066e4d26a
Amith Yamasani [Thu, 16 Jun 2016 00:24:14 +0000 (00:24 +0000)]
Merge \"More thorough cleansing of expired users\" into nyc-dev
am:
4f2b1b455e
Change-Id: I5714f73a9b90c0cb8fee653abf799374acfc6232
Amith Yamasani [Thu, 16 Jun 2016 00:14:57 +0000 (00:14 +0000)]
Merge "More thorough cleansing of expired users" into nyc-dev
Mihai Nita [Wed, 15 Jun 2016 23:34:50 +0000 (16:34 -0700)]
Fix for NullPointerException in SuggestedLocaleAdapter
Bug:
28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69
Mady Mellor [Wed, 15 Jun 2016 23:41:40 +0000 (23:41 +0000)]
Merge \\\"Fixes issue with group backgrounds when animating to keyguard\\\" into nyc-dev am:
8363980d45 am:
3cb4c159f7
am:
fbc259e066
Change-Id: Ie3a7f42990a48f58573670d4d9e35aa3f262bb57
Mady Mellor [Wed, 15 Jun 2016 23:41:38 +0000 (23:41 +0000)]
Merge \\\"Fixes issue with group backgrounds when animating to keyguard\\\" into nyc-dev am:
8363980d45 am:
337c714364
am:
e821f6def2
Change-Id: Ie5a459ca68b3539ba084e908a4626278271c96e9
Mady Mellor [Wed, 15 Jun 2016 23:37:03 +0000 (23:37 +0000)]
Merge \\"Fixes issue with group backgrounds when animating to keyguard\\" into nyc-dev am:
8363980d45
am:
3cb4c159f7
Change-Id: I72d03589032791c2c32ca1bb4e94f1bf86467b25
Bert McMeen [Wed, 15 Jun 2016 23:35:54 +0000 (23:35 +0000)]
Merge \\\\\"Docs: A removal from docs of an obsolete watch face permission\\\\\" into mnc-io-docs am:
9011149e19 am:
7250594f04 am:
0caf0b7259 am:
7716f3ffe7
am:
27a199033e
Change-Id: Ic0403c5feb8ebe1aedc54d4f5fbbd0b21fdaff3b
Bert McMeen [Wed, 15 Jun 2016 23:35:48 +0000 (23:35 +0000)]
Merge \\\\\"Docs: A removal from docs of an obsolete watch face permission\\\\\" into mnc-io-docs am:
9011149e19 am:
7250594f04 am:
0caf0b7259 am:
717f3e999c
am:
23b6556f65
Change-Id: I80c60786665bc5fea4d7361ee5d38b3b6bad5616
Mady Mellor [Wed, 15 Jun 2016 23:34:11 +0000 (23:34 +0000)]
Merge \\"Fixes issue with group backgrounds when animating to keyguard\\" into nyc-dev am:
8363980d45
am:
337c714364
Change-Id: Ib0492e3f57c1ff6f04d2a5b1b589855dbf842362
Selim Cinek [Wed, 15 Jun 2016 18:46:37 +0000 (11:46 -0700)]
Added dismiss, expand, and collapse accessibility actions
Fixes:
20343017
Fixes:
29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
Mady Mellor [Wed, 15 Jun 2016 23:27:41 +0000 (23:27 +0000)]
Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
am:
8363980d45
Change-Id: Iee12dc78f65a0e4acb09f513fd9578f28f7a5e2e
Mady Mellor [Wed, 15 Jun 2016 23:27:39 +0000 (23:27 +0000)]
Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
am:
8363980d45
Change-Id: I99a748be4a74e917f7e17fdf7ad9a7c52d120a0b
Bert McMeen [Wed, 15 Jun 2016 23:23:19 +0000 (23:23 +0000)]
Merge \\\\"Docs: A removal from docs of an obsolete watch face permission\\\\" into mnc-io-docs am:
9011149e19 am:
7250594f04 am:
0caf0b7259
am:
7716f3ffe7
Change-Id: If175f56915b84732c2995eb22f9c13cce6e8492b
Mady Mellor [Wed, 15 Jun 2016 23:20:22 +0000 (23:20 +0000)]
Merge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev
Winson [Wed, 15 Jun 2016 23:20:00 +0000 (23:20 +0000)]
Merge \"Merge \\\"Fixing issue with screen pinning screen not showing for secondary users.\\\" into nyc-dev am:
9a75ed7ab5 am:
511562ee23\" into nyc-mr1-dev-plus-aosp
am:
96c49958d7
Change-Id: Iea20f4afc2bfbc50f585970817f645ea2a43d630
Winson [Wed, 15 Jun 2016 23:19:57 +0000 (23:19 +0000)]
Merge \\\"Fixing issue with screen pinning screen not showing for secondary users.\\\" into nyc-dev am:
9a75ed7ab5 am:
43fb1f2ec7
am:
f162a93e7d
Change-Id: I27b6f656da64122d304f9044d47cffe927a3dbe1
Brad Ebinger [Wed, 15 Jun 2016 23:19:54 +0000 (23:19 +0000)]
Merge \\\"Handle Concurrency issues in Connection\\\" into nyc-dev am:
df41725e53 am:
e93c91edc2
am:
a9fd939bd4
Change-Id: I6921442c97be387a6d21d7893d9d4fc3b6957a7d
Adam Lesinski [Wed, 15 Jun 2016 23:19:53 +0000 (23:19 +0000)]
Merge \\\"ResourcesManager: Allow managed addition of library asset paths\\\" into nyc-dev am:
464bda8a2b am:
1dda5b39d4
am:
be9af5f687
Change-Id: I1472e621331a785c55944d61d23575410e64862a
Brad Ebinger [Wed, 15 Jun 2016 23:19:50 +0000 (23:19 +0000)]
Merge \\\"Handle Concurrency issues in Connection\\\" into nyc-dev am:
df41725e53 am:
53a8774be1
am:
9d2da303e0
Change-Id: Ia9f614df6cf7d9f8ff1af802b62f61326739e561
Bert McMeen [Wed, 15 Jun 2016 23:19:06 +0000 (23:19 +0000)]
Merge \\\\"Docs: A removal from docs of an obsolete watch face permission\\\\" into mnc-io-docs am:
9011149e19 am:
7250594f04 am:
0caf0b7259
am:
717f3e999c
Change-Id: I7d9451f8ed43e35c7a4666bc351c6300f9845229
Adam Lesinski [Wed, 15 Jun 2016 23:14:51 +0000 (23:14 +0000)]
Merge \\\"ResourcesManager: Allow managed addition of library asset paths\\\" into nyc-dev am:
464bda8a2b am:
c3ab1b7c0a
am:
f4152a9c7e
Change-Id: I2b3190f567f62bfaeed54ec6047cfd42bcd246e8
Pavel Zhamaitsiak [Wed, 15 Jun 2016 23:14:43 +0000 (23:14 +0000)]
Merge \\"Move IMS-related protected broadcasts to packages/services/Telephony\\" into nyc-mr1-dev am:
9b464f651b
am:
960187cfd7
Change-Id: Ie13deb46a8ee9201087a00fc9318cfa9462dcd98
Makoto Onuki [Wed, 15 Jun 2016 23:14:15 +0000 (23:14 +0000)]
Merge \\"ShortcutManger: Auto-adjust ranks.\\" into nyc-mr1-dev am:
70a91541e9
am:
35f77b2b74
Change-Id: If3e4a6387085b6a58154619af326e39f497158db
Andrew Solovay [Wed, 15 Jun 2016 23:14:12 +0000 (23:14 +0000)]
Merge \"Merge \\\"docs: Added AfW item to DP4 \\\"Behavior Changes\\\" page\\\" into nyc-dev am:
8e8fb7dda0 am:
ca460ea167\" into nyc-mr1-dev-plus-aosp
am:
944985563b
Change-Id: If761c35f768903d066131f763fca411e258c3bf0
Andrew Solovay [Wed, 15 Jun 2016 23:14:10 +0000 (23:14 +0000)]
Merge \\"Merge \\\\"Delete simple reduction implementation.\\\\" am:
e8909dc0f4 am:
403aa6e3ec\\" into nyc-dev-plus-aosp am:
4095ac603d
am:
a860731b7f
Change-Id: I0da69ab120e86d6263bb4bbf8cea187dc0e9b8bf
Bert McMeen [Wed, 15 Jun 2016 23:13:31 +0000 (23:13 +0000)]
Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am:
9011149e19 am:
7250594f04
am:
0caf0b7259
Change-Id: I1fb1c058b95de1786dd4484a9bde085c522d2af5
Bert McMeen [Wed, 15 Jun 2016 23:13:27 +0000 (23:13 +0000)]
Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am:
9011149e19 am:
7250594f04
am:
0caf0b7259
Change-Id: I34c4adf1e9c003ab24c9fa07f879927fd3db4332
Bert McMeen [Wed, 15 Jun 2016 23:08:28 +0000 (23:08 +0000)]
Merge \\"Docs: A removal from docs of an obsolete watch face permission\\" into mnc-io-docs am:
9011149e19
am:
7250594f04
Change-Id: I486c9ee933a6ed64d90013cf9964e7106713dde8
David Gross [Wed, 15 Jun 2016 23:07:28 +0000 (23:07 +0000)]
Merge \\"Merge \\\\"Delete simple reduction implementation.\\\\" am:
e8909dc0f4 am:
403aa6e3ec\\" into nyc-dev-plus-aosp am:
7f77a11aa8
am:
3a6ac9a6d3
Change-Id: I793260914164d7f8652df06940852c53ab02d770
Brian Duddie [Wed, 15 Jun 2016 23:07:14 +0000 (23:07 +0000)]
Merge \\\"Send VR mode notification to AR app on context hub\\\" into nyc-dev am:
9a31e8be48 am:
5ccbc93032
am:
23031ebca4
Change-Id: I12339db80053060f42ce99fa6437c557c3c2cc4b
Richard Ho [Wed, 15 Jun 2016 23:07:12 +0000 (23:07 +0000)]
Merge \\\"added null check in doInBackground and if null, properly intializes variables.\\\" into nyc-dev am:
07a375186e am:
924b83540b
am:
bf4d54ddeb
Change-Id: I74351c71e4ffb2181679322b728524c5a7cf52ea
Brian Duddie [Wed, 15 Jun 2016 23:07:10 +0000 (23:07 +0000)]
Merge \\\"Send VR mode notification to AR app on context hub\\\" into nyc-dev am:
9a31e8be48 am:
93a2410f2d
am:
a9edc2edf2
Change-Id: Ia356dd1453a4ebf320d3ce01dc6b4596c3507433
Hall Liu [Wed, 15 Jun 2016 23:06:58 +0000 (23:06 +0000)]
Merge \\"Add support for Telecom analytics extensions\\" into nyc-mr1-dev am:
81ce5bc113
am:
31d9aa4f28
Change-Id: Ib19ee7012889b316dc7b9ad73db365c22e2217a1
Android Build Merger (Role) [Wed, 15 Jun 2016 23:04:12 +0000 (23:04 +0000)]
Merge "Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am:
9a75ed7ab5 am:
511562ee23" into nyc-mr1-dev-plus-aosp
Richard Ho [Wed, 15 Jun 2016 23:03:55 +0000 (23:03 +0000)]
Merge \\\"added null check in doInBackground and if null, properly intializes variables.\\\" into nyc-dev am:
07a375186e am:
354c9ff3d5
am:
43d05f9aad
Change-Id: I921bf9f13a4f3c6e46aadfcd0478a3bee80ba99c
Kevin Gabayan [Wed, 15 Jun 2016 23:03:51 +0000 (23:03 +0000)]
Merge \"Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd am:
83806ba310\" into nyc-mr1-dev-plus-aosp
am:
a7943601c0
Change-Id: I01adedbe76c99fe2a9e765932d2d2c8112062dc3
Winson [Wed, 15 Jun 2016 23:03:49 +0000 (23:03 +0000)]
Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am:
9a75ed7ab5
am:
511562ee23
Change-Id: I84d8706696ebfc72c66637b34e101f836d398551
Tianjie Xu [Wed, 15 Jun 2016 23:03:45 +0000 (23:03 +0000)]
Merge \"Merge \\\"Fix a naming typo for source_build\\\" into nyc-dev am:
dfa654edfe am:
ab1a5e456e\" into nyc-mr1-dev-plus-aosp
am:
adff15ab15
Change-Id: I71c2812be03faa679a0a757c404bc792a0f0d179
Kevin Gabayan [Wed, 15 Jun 2016 23:03:42 +0000 (23:03 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd am:
c31247d9af
am:
7368324a99
Change-Id: I9907652483c1da135b4cdf99dc6f4709eacb68d7
Tianjie Xu [Wed, 15 Jun 2016 23:03:40 +0000 (23:03 +0000)]
Merge \\\"Fix a naming typo for source_build\\\" into nyc-dev am:
dfa654edfe am:
5b767d1218
am:
a92b4737c6
Change-Id: I89897592b5425a3601afa47813c6d109c4d85cd9
Bert McMeen [Wed, 15 Jun 2016 23:03:13 +0000 (23:03 +0000)]
Merge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc-io-docs
am:
9011149e19
Change-Id: If34c51a5c2f8b28612c3526ca40cfce5a9a4a140
Winson [Wed, 15 Jun 2016 23:02:42 +0000 (23:02 +0000)]
Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am:
9a75ed7ab5
am:
43fb1f2ec7
Change-Id: I8d63ffb4111b6bb52a1a3a23bf326b6f8c4860ba
Brad Ebinger [Wed, 15 Jun 2016 23:02:36 +0000 (23:02 +0000)]
Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am:
df41725e53
am:
e93c91edc2
Change-Id: Ib9854a5a3c570f648701201594ba74ad29ce487b
Adam Lesinski [Wed, 15 Jun 2016 23:02:29 +0000 (23:02 +0000)]
Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am:
464bda8a2b
am:
1dda5b39d4
Change-Id: Ia74707d5196b7821ea6e471181277882a339f55c
Erik Wolsheimer [Wed, 15 Jun 2016 22:58:23 +0000 (22:58 +0000)]
Merge \\"Add DENSITY_260, DENSITY_300, DENSITY_340\\" into nyc-mr1-dev am:
e37ee119c2
am:
4d4d4706ab
Change-Id: Ib807e30b2c8ea58592df33ceb9d1e1344e7dce04
Bert McMeen [Wed, 15 Jun 2016 22:57:57 +0000 (22:57 +0000)]
Merge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io-docs
Winson [Wed, 15 Jun 2016 22:57:30 +0000 (22:57 +0000)]
Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am:
9a75ed7ab5
Change-Id: I4b7de84af1cf78a8871fccd555e27d4997cc21a2
Brad Ebinger [Wed, 15 Jun 2016 22:57:14 +0000 (22:57 +0000)]
Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am:
df41725e53
am:
53a8774be1
Change-Id: Ie9303bed357327079711ba8809fb05c15b9ec7a6
Winson [Wed, 15 Jun 2016 22:57:09 +0000 (22:57 +0000)]
Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am:
9a75ed7ab5
Change-Id: I8dffa83fc2f3cb031062412171453dc7d19a2e66
Adam Lesinski [Wed, 15 Jun 2016 22:57:08 +0000 (22:57 +0000)]
Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am:
464bda8a2b
am:
c3ab1b7c0a
Change-Id: I6d268a2d0871de19a57358ff7755c525906aae1c
Pavel Zhamaitsiak [Wed, 15 Jun 2016 22:50:10 +0000 (22:50 +0000)]
Merge \"Move IMS-related protected broadcasts to packages/services/Telephony\" into nyc-mr1-dev
am:
9b464f651b
Change-Id: I68c7689a172d8d4c8c15df776b8b355c0cb7b305
TreeHugger Robot [Wed, 15 Jun 2016 22:48:53 +0000 (22:48 +0000)]
Merge "Fixing issue with screen pinning screen not showing for secondary users." into nyc-dev
Brad Ebinger [Wed, 15 Jun 2016 22:48:06 +0000 (22:48 +0000)]
Merge \"Handle Concurrency issues in Connection\" into nyc-dev
am:
df41725e53
Change-Id: I0332df9dc96086a3094dc4ab53573b5cf57f8730
Adam Lesinski [Wed, 15 Jun 2016 22:47:58 +0000 (22:47 +0000)]
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am:
464bda8a2b
Change-Id: I0609c73c4f36b48970bba83b6ea5bd95e6c2d956
Brad Ebinger [Wed, 15 Jun 2016 22:44:46 +0000 (22:44 +0000)]
Merge \"Handle Concurrency issues in Connection\" into nyc-dev
am:
df41725e53
Change-Id: I67aa42350cf8ec3e998f42a7856e19ac887a5553
Adam Lesinski [Wed, 15 Jun 2016 22:44:43 +0000 (22:44 +0000)]
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am:
464bda8a2b
Change-Id: I352c56482aca030efab49ca39301679b51e44e05
TreeHugger Robot [Wed, 15 Jun 2016 22:39:17 +0000 (22:39 +0000)]
Merge "Move IMS-related protected broadcasts to packages/services/Telephony" into nyc-mr1-dev
OSDN Git Service
