OSDN Git Service
Bill Yi [Thu, 16 Jun 2016 10:08:55 +0000 (10:08 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
65266b99d2 -s ours
am:
f924f2130f -s ours
Change-Id: Ie9b5a6e2814d4e7f7b7146c677aeed6932c5b11c
Bill Yi [Thu, 16 Jun 2016 10:03:34 +0000 (10:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
65266b99d2 -s ours
Change-Id: I93855bfa75cc031fe4e4d1812c415ae359a34b5b
Bill Yi [Thu, 16 Jun 2016 10:03:22 +0000 (10:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
5ed24ad6c3 -s ours
Change-Id: I782614166a75a36f637de928b66d527b68413e69
TreeHugger Robot [Thu, 16 Jun 2016 09:58:55 +0000 (09:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 09:57:54 +0000 (09:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 05:10:07 +0000 (22:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d0d4f9c0cc63d726daf44da8cb5f1b11dca276f
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Jun 2016 04:49:11 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e3e3acf4c81fea5831768ccb73a313d16bab865
Auto-generated-cl: translation import
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: I25bd41f1307233bba14067952086ca7be3118505
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
TreeHugger Robot [Thu, 16 Jun 2016 04:19:47 +0000 (04:19 +0000)]
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
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 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
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: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
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
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
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
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
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
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
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
Brad Ebinger [Wed, 15 Jun 2016 22:37:44 +0000 (22:37 +0000)]
Merge "Handle Concurrency issues in Connection" into nyc-dev
Adam Lesinski [Wed, 15 Jun 2016 22:35:25 +0000 (22:35 +0000)]
Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev
Makoto Onuki [Wed, 15 Jun 2016 21:59:09 +0000 (21:59 +0000)]
Merge \"ShortcutManger: Auto-adjust ranks.\" into nyc-mr1-dev
am:
70a91541e9
Change-Id: I42d2d2a954bd2f52bd7b75cfd051bab0def100da
Android Build Merger (Role) [Wed, 15 Jun 2016 21:49:48 +0000 (21:49 +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
Andrew Solovay [Wed, 15 Jun 2016 21:49:20 +0000 (21:49 +0000)]
Merge \\"docs: Added AfW item to DP4 \\"Behavior Changes\\" page\\" into nyc-dev am:
8e8fb7dda0
am:
ca460ea167
Change-Id: I451258a187d5acb214ea0c54cca4c030069d6faa
David Gross [Wed, 15 Jun 2016 21:47:49 +0000 (21:47 +0000)]
Merge \"Merge \\\"Delete simple reduction implementation.\\\" am:
e8909dc0f4 am:
403aa6e3ec\" into nyc-dev-plus-aosp
am:
4095ac603d
Change-Id: I8012d70740ad7cc41eec9f4eef9fead50b9c72ba
Makoto Onuki [Wed, 15 Jun 2016 21:44:57 +0000 (21:44 +0000)]
Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev
Andrew Solovay [Wed, 15 Jun 2016 21:42:20 +0000 (21:42 +0000)]
Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
am:
8e8fb7dda0
Change-Id: I9533642e3685f70351e46e29b8503569ae25dc50
Andrew Solovay [Wed, 15 Jun 2016 21:42:17 +0000 (21:42 +0000)]
Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
am:
8e8fb7dda0
Change-Id: I756b3d9c2118946c9f389e209682cf4a8b984aec
David Gross [Wed, 15 Jun 2016 21:40:24 +0000 (21:40 +0000)]
Merge \"Merge \\\"Delete simple reduction implementation.\\\" am:
e8909dc0f4 am:
403aa6e3ec\" into nyc-dev-plus-aosp
am:
7f77a11aa8
Change-Id: I2cde9bb07f58005b80fe5db5de1e41b3f52f9aad
Brian Duddie [Wed, 15 Jun 2016 21:40:05 +0000 (21:40 +0000)]
Merge \\"Send VR mode notification to AR app on context hub\\" into nyc-dev am:
9a31e8be48
am:
5ccbc93032
Change-Id: Ibf14c3f643560cb84776ffe84a8c3abc104bef56
Richard Ho [Wed, 15 Jun 2016 21:39:47 +0000 (21:39 +0000)]
Merge \\"added null check in doInBackground and if null, properly intializes variables.\\" into nyc-dev am:
07a375186e
am:
924b83540b
Change-Id: I250dca2c872cf49b9bb49bc929b15c591dbeaff2
TreeHugger Robot [Wed, 15 Jun 2016 21:36:02 +0000 (21:36 +0000)]
Merge "docs: Added AfW item to DP4 "Behavior Changes" page" into nyc-dev
Brian Duddie [Wed, 15 Jun 2016 21:32:57 +0000 (21:32 +0000)]
Merge \\"Send VR mode notification to AR app on context hub\\" into nyc-dev am:
9a31e8be48
am:
93a2410f2d
Change-Id: Id041412ad3d4bb72d3284e307a9621c2db1f0e8d
Hall Liu [Wed, 15 Jun 2016 21:32:05 +0000 (21:32 +0000)]
Merge \"Add support for Telecom analytics extensions\" into nyc-mr1-dev
am:
81ce5bc113
Change-Id: I0902866046098d6fe23cf093b561008958ba29e2
Brian Duddie [Wed, 15 Jun 2016 21:28:52 +0000 (21:28 +0000)]
Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am:
9a31e8be48
Change-Id: Ied704de01ddc2b9754a5a2d88b7b9624d711dd11
Makoto Onuki [Wed, 8 Jun 2016 19:30:23 +0000 (12:30 -0700)]
ShortcutManger: Auto-adjust ranks.
Spec: go/shortcutmanager-spec-ranks
Bug
28984376
Bug
28536066
Change-Id: Ibffb92233c62792af06eeadc5a9a6379d0506a3c
Hall Liu [Wed, 15 Jun 2016 21:24:14 +0000 (21:24 +0000)]
Merge "Add support for Telecom analytics extensions" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 21:22:23 +0000 (21:22 +0000)]
Merge "Merge \\"Delete simple reduction implementation.\\" am:
e8909dc0f4 am:
403aa6e3ec" into nyc-dev-plus-aosp
David Gross [Wed, 15 Jun 2016 21:21:16 +0000 (21:21 +0000)]
Merge \\"Delete simple reduction implementation.\\" am:
e8909dc0f4
am:
403aa6e3ec
Change-Id: I56d6d5806c064fa22b969b53dc2e7028f51d78cc
Richard Ho [Wed, 15 Jun 2016 21:21:10 +0000 (21:21 +0000)]
Merge \\"added null check in doInBackground and if null, properly intializes variables.\\" into nyc-dev am:
07a375186e
am:
354c9ff3d5
Change-Id: I3b9e43d334885bd32e4cf2cbe6b17305c77d9d67
Brian Duddie [Wed, 15 Jun 2016 21:19:18 +0000 (21:19 +0000)]
Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am:
9a31e8be48
Change-Id: I2ca21c574b86544ddf597290670ecea4a004e4d6
Richard Ho [Wed, 15 Jun 2016 21:19:08 +0000 (21:19 +0000)]
Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
am:
07a375186e
Change-Id: I5f42789366c96386f7870d2b38c7530cd2bac81d
Richard Ho [Wed, 15 Jun 2016 21:14:24 +0000 (21:14 +0000)]
Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
am:
07a375186e
Change-Id: Icd7c52967c634dbdbef55166523039f4004e4d9a
David Gross [Wed, 15 Jun 2016 21:11:19 +0000 (21:11 +0000)]
Merge \"Delete simple reduction implementation.\"
am:
e8909dc0f4
Change-Id: I76f07b8fc893ac8b67b131b84e34594b0fd3d9b1
TreeHugger Robot [Wed, 15 Jun 2016 21:09:31 +0000 (21:09 +0000)]
Merge "Send VR mode notification to AR app on context hub" into nyc-dev
Richard Ho [Wed, 15 Jun 2016 21:06:05 +0000 (21:06 +0000)]
Merge "added null check in doInBackground and if null, properly intializes variables." into nyc-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 21:05:08 +0000 (21:05 +0000)]
Merge "Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd am:
83806ba310" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 15 Jun 2016 21:04:55 +0000 (21:04 +0000)]
Merge "Merge \\"Fix a naming typo for source_build\\" into nyc-dev am:
dfa654edfe am:
ab1a5e456e" into nyc-mr1-dev-plus-aosp
Kevin Gabayan [Wed, 15 Jun 2016 21:04:11 +0000 (21:04 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd
am:
83806ba310
Change-Id: I7a9b682ac8eba5101e3bc4a2a649cad8187ddb4e
Tianjie Xu [Wed, 15 Jun 2016 21:04:08 +0000 (21:04 +0000)]
Merge \\"Fix a naming typo for source_build\\" into nyc-dev am:
dfa654edfe
am:
ab1a5e456e
Change-Id: I9bdf90d0d77fe7f4a18f4c745ca84c9131045888
Kevin Gabayan [Wed, 15 Jun 2016 21:04:06 +0000 (21:04 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd
am:
c31247d9af
Change-Id: I296833729fcc8136c4444d853d2860b164aa2f35
Tianjie Xu [Wed, 15 Jun 2016 21:04:04 +0000 (21:04 +0000)]
Merge \\"Fix a naming typo for source_build\\" into nyc-dev am:
dfa654edfe
am:
5b767d1218
Change-Id: Iba0740a38e7f9fd97175542ee5255548470b510c
OSDN Git Service
