269169 Commits

Author SHA1 Message Date
Richard Ho
b665551bea Merge \\\"added null check in doInBackground and if null, properly intializes variables.\\\" into nyc-dev am: 07a375186e am: 924b83540b
am: bf4d54ddeb

Change-Id: I74351c71e4ffb2181679322b728524c5a7cf52ea
2016-06-15 23:07:12 +00:00
Brian Duddie
916e86e6fb Merge \\\"Send VR mode notification to AR app on context hub\\\" into nyc-dev am: 9a31e8be48 am: 93a2410f2d
am: a9edc2edf2

Change-Id: Ia356dd1453a4ebf320d3ce01dc6b4596c3507433
2016-06-15 23:07:10 +00:00
Hall Liu
b03b9aa61b Merge \\"Add support for Telecom analytics extensions\\" into nyc-mr1-dev am: 81ce5bc113
am: 31d9aa4f28

Change-Id: Ib19ee7012889b316dc7b9ad73db365c22e2217a1
2016-06-15 23:06:58 +00:00
Android Build Merger (Role)
96c49958d7 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 2016-06-15 23:04:14 +00:00
Richard Ho
af36623b68 Merge \\\"added null check in doInBackground and if null, properly intializes variables.\\\" into nyc-dev am: 07a375186e am: 354c9ff3d5
am: 43d05f9aad

Change-Id: I921bf9f13a4f3c6e46aadfcd0478a3bee80ba99c
2016-06-15 23:03:55 +00:00
Kevin Gabayan
3dbd763ee6 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
2016-06-15 23:03:51 +00:00
Winson
6c6e6ceb5d Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am: 9a75ed7ab5
am: 511562ee23

Change-Id: I84d8706696ebfc72c66637b34e101f836d398551
2016-06-15 23:03:49 +00:00
Tianjie Xu
caf6e286e6 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
2016-06-15 23:03:45 +00:00
Kevin Gabayan
8adbdad390 Compute AnyMotionDetector angle using atan2. Bug: 29232136 am: db843c913f am: e46d4fd7ad am: 68dd6233bd am: c31247d9af
am: 7368324a99

Change-Id: I9907652483c1da135b4cdf99dc6f4709eacb68d7
2016-06-15 23:03:42 +00:00
Tianjie Xu
f3d0a4c63b Merge \\\"Fix a naming typo for source_build\\\" into nyc-dev am: dfa654edfe am: 5b767d1218
am: a92b4737c6

Change-Id: I89897592b5425a3601afa47813c6d109c4d85cd9
2016-06-15 23:03:40 +00:00
Bert McMeen
7250594f04 Merge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc-io-docs
am: 9011149e19

Change-Id: If34c51a5c2f8b28612c3526ca40cfce5a9a4a140
2016-06-15 23:03:13 +00:00
Winson
f162a93e7d Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am: 9a75ed7ab5
am: 43fb1f2ec7

Change-Id: I8d63ffb4111b6bb52a1a3a23bf326b6f8c4860ba
2016-06-15 23:02:42 +00:00
Brad Ebinger
a9fd939bd4 Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53
am: e93c91edc2

Change-Id: Ib9854a5a3c570f648701201594ba74ad29ce487b
2016-06-15 23:02:36 +00:00
Adam Lesinski
be9af5f687 Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
am: 1dda5b39d4

Change-Id: Ia74707d5196b7821ea6e471181277882a339f55c
2016-06-15 23:02:29 +00:00
Erik Wolsheimer
28a04413b8 Merge \\"Add DENSITY_260, DENSITY_300, DENSITY_340\\" into nyc-mr1-dev am: e37ee119c2
am: 4d4d4706ab

Change-Id: Ib807e30b2c8ea58592df33ceb9d1e1344e7dce04
2016-06-15 22:58:23 +00:00
Bert McMeen
9011149e19 Merge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io-docs 2016-06-15 22:57:59 +00:00
Winson
511562ee23 Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am: 9a75ed7ab5

Change-Id: I4b7de84af1cf78a8871fccd555e27d4997cc21a2
2016-06-15 22:57:30 +00:00
Brad Ebinger
9d2da303e0 Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53
am: 53a8774be1

Change-Id: Ie9303bed357327079711ba8809fb05c15b9ec7a6
2016-06-15 22:57:14 +00:00
Winson
43fb1f2ec7 Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am: 9a75ed7ab5

Change-Id: I8dffa83fc2f3cb031062412171453dc7d19a2e66
2016-06-15 22:57:09 +00:00
Adam Lesinski
f4152a9c7e Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
am: c3ab1b7c0a

Change-Id: I6d268a2d0871de19a57358ff7755c525906aae1c
2016-06-15 22:57:08 +00:00
Pavel Zhamaitsiak
960187cfd7 Merge \"Move IMS-related protected broadcasts to packages/services/Telephony\" into nyc-mr1-dev
am: 9b464f651b

Change-Id: I68c7689a172d8d4c8c15df776b8b355c0cb7b305
2016-06-15 22:50:10 +00:00
TreeHugger Robot
9a75ed7ab5 Merge "Fixing issue with screen pinning screen not showing for secondary users." into nyc-dev 2016-06-15 22:48:55 +00:00
Brad Ebinger
e93c91edc2 Merge \"Handle Concurrency issues in Connection\" into nyc-dev
am: df41725e53

Change-Id: I0332df9dc96086a3094dc4ab53573b5cf57f8730
2016-06-15 22:48:06 +00:00
Adam Lesinski
1dda5b39d4 Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am: 464bda8a2b

Change-Id: I0609c73c4f36b48970bba83b6ea5bd95e6c2d956
2016-06-15 22:47:58 +00:00
Brad Ebinger
53a8774be1 Merge \"Handle Concurrency issues in Connection\" into nyc-dev
am: df41725e53

Change-Id: I67aa42350cf8ec3e998f42a7856e19ac887a5553
2016-06-15 22:44:46 +00:00
Adam Lesinski
c3ab1b7c0a Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am: 464bda8a2b

Change-Id: I352c56482aca030efab49ca39301679b51e44e05
2016-06-15 22:44:43 +00:00
TreeHugger Robot
9b464f651b Merge "Move IMS-related protected broadcasts to packages/services/Telephony" into nyc-mr1-dev 2016-06-15 22:39:19 +00:00
Brad Ebinger
df41725e53 Merge "Handle Concurrency issues in Connection" into nyc-dev 2016-06-15 22:37:46 +00:00
Daniel Nishi
107a626b09 Merge "resolve merge conflicts of 2d41ae0 to master" 2016-06-15 22:36:06 +00:00
Adam Lesinski
464bda8a2b Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev 2016-06-15 22:35:26 +00:00
Roozbeh Pournader
5c857c7fc5 Merge "Remove modifications to emoji data" 2016-06-15 22:15:02 +00:00
Roozbeh Pournader
3b2322432b Merge "Move matching Tagalog and Filipino to ResourceTypes.cpp" 2016-06-15 22:06:02 +00:00
Makoto Onuki
35f77b2b74 Merge \"ShortcutManger: Auto-adjust ranks.\" into nyc-mr1-dev
am: 70a91541e9

Change-Id: I42d2d2a954bd2f52bd7b75cfd051bab0def100da
2016-06-15 21:59:09 +00:00
Android Build Merger (Role)
944985563b Merge "Merge \\"docs: Added AfW item to DP4 \\"Behavior Changes\\" page\\" into nyc-dev am: 8e8fb7dda0 am: ca460ea167" into nyc-mr1-dev-plus-aosp 2016-06-15 21:49:50 +00:00
Andrew Solovay
7dc8bee3e0 Merge \\"docs: Added AfW item to DP4 \\"Behavior Changes\\" page\\" into nyc-dev am: 8e8fb7dda0
am: ca460ea167

Change-Id: I451258a187d5acb214ea0c54cca4c030069d6faa
2016-06-15 21:49:20 +00:00
David Gross
a860731b7f Merge \"Merge \\\"Delete simple reduction implementation.\\\" am: e8909dc0f4 am: 403aa6e3ec\" into nyc-dev-plus-aosp
am: 4095ac603d

Change-Id: I8012d70740ad7cc41eec9f4eef9fead50b9c72ba
2016-06-15 21:47:49 +00:00
Makoto Onuki
70a91541e9 Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev 2016-06-15 21:44:58 +00:00
Andrew Solovay
4095ac603d Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
am: 8e8fb7dda0

Change-Id: I9533642e3685f70351e46e29b8503569ae25dc50
2016-06-15 21:42:20 +00:00
Andrew Solovay
ca460ea167 Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
am: 8e8fb7dda0

Change-Id: I756b3d9c2118946c9f389e209682cf4a8b984aec
2016-06-15 21:42:17 +00:00
David Gross
3a6ac9a6d3 Merge \"Merge \\\"Delete simple reduction implementation.\\\" am: e8909dc0f4 am: 403aa6e3ec\" into nyc-dev-plus-aosp
am: 7f77a11aa8

Change-Id: I2cde9bb07f58005b80fe5db5de1e41b3f52f9aad
2016-06-15 21:40:24 +00:00
Brian Duddie
23031ebca4 Merge \\"Send VR mode notification to AR app on context hub\\" into nyc-dev am: 9a31e8be48
am: 5ccbc93032

Change-Id: Ibf14c3f643560cb84776ffe84a8c3abc104bef56
2016-06-15 21:40:05 +00:00
Richard Ho
bf4d54ddeb Merge \\"added null check in doInBackground and if null, properly intializes variables.\\" into nyc-dev am: 07a375186e
am: 924b83540b

Change-Id: I250dca2c872cf49b9bb49bc929b15c591dbeaff2
2016-06-15 21:39:47 +00:00
TreeHugger Robot
8e8fb7dda0 Merge "docs: Added AfW item to DP4 "Behavior Changes" page" into nyc-dev 2016-06-15 21:36:05 +00:00
Brian Duddie
a9edc2edf2 Merge \\"Send VR mode notification to AR app on context hub\\" into nyc-dev am: 9a31e8be48
am: 93a2410f2d

Change-Id: Id041412ad3d4bb72d3284e307a9621c2db1f0e8d
2016-06-15 21:32:57 +00:00
Hall Liu
31d9aa4f28 Merge \"Add support for Telecom analytics extensions\" into nyc-mr1-dev
am: 81ce5bc113

Change-Id: I0902866046098d6fe23cf093b561008958ba29e2
2016-06-15 21:32:05 +00:00
Brian Duddie
93a2410f2d Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am: 9a31e8be48

Change-Id: Ied704de01ddc2b9754a5a2d88b7b9624d711dd11
2016-06-15 21:28:52 +00:00
Makoto Onuki
9e1f5595bd ShortcutManger: Auto-adjust ranks.
Spec: go/shortcutmanager-spec-ranks

Bug 28984376
Bug 28536066

Change-Id: Ibffb92233c62792af06eeadc5a9a6379d0506a3c
2016-06-15 14:24:44 -07:00
Hall Liu
81ce5bc113 Merge "Add support for Telecom analytics extensions" into nyc-mr1-dev 2016-06-15 21:24:16 +00:00
Android Build Merger (Role)
7f77a11aa8 Merge "Merge \\"Delete simple reduction implementation.\\" am: e8909dc0f4 am: 403aa6e3ec" into nyc-dev-plus-aosp 2016-06-15 21:22:25 +00:00
David Gross
09c0ebe4df Merge \\"Delete simple reduction implementation.\\" am: e8909dc0f4
am: 403aa6e3ec

Change-Id: I56d6d5806c064fa22b969b53dc2e7028f51d78cc
2016-06-15 21:21:16 +00:00