OSDN Git Service
Geoffrey Pitsch [Tue, 30 May 2017 15:51:49 +0000 (15:51 +0000)]
Merge "Reduce toast duration for channel warnings." into oc-dev am:
f6e956b1c6
am:
c1dc15e8d0
Change-Id: I7c837df3a91727be805109dd8608b1e76761daec
Geoffrey Pitsch [Tue, 30 May 2017 15:44:14 +0000 (15:44 +0000)]
Merge "Reduce toast duration for channel warnings." into oc-dev
am:
f6e956b1c6
Change-Id: I5a28910fa155a17256655ccd2cc0dc341dc3fbc3
Geoffrey Pitsch [Tue, 30 May 2017 15:38:59 +0000 (15:38 +0000)]
Merge "Reduce toast duration for channel warnings." into oc-dev
Erik Kline [Tue, 30 May 2017 14:07:51 +0000 (14:07 +0000)]
Merge "Support "dumpsys connectivity tethering"" am:
6cdcba7b48 am:
06e6033327 am:
ff8b93f815
am:
7287c98414
Change-Id: I222bf3363de805dd21e1cd62c056a292a5bd9f90
Joel Scherpelz [Tue, 30 May 2017 14:05:09 +0000 (14:05 +0000)]
Merge "Support requesting and receiving wakeup events" am:
bf152b14c4 am:
4971745cf4 am:
880974f111
am:
8889985364
Change-Id: Ieebf469339b2c3ccc928a342e5e182f7c8c00480
Erik Kline [Tue, 30 May 2017 14:02:50 +0000 (14:02 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration" am:
39ce589f0b am:
8211c36db9 am:
1315903420
am:
3f5f551042
Change-Id: Iccfbc1a3d0bc55c4fb2188a06a31ec3eaf584547
Felipe Leme [Tue, 30 May 2017 14:00:33 +0000 (14:00 +0000)]
Merge "Improved autofillHints documentation." into oc-dev am:
0b1b1c4346
am:
fdd1fd3264
Change-Id: I0ee7a603fbc4d2048258b52144cce90409d2e8c3
Adam Lesinski [Tue, 30 May 2017 13:58:24 +0000 (13:58 +0000)]
Merge "AAPT2: Follow symlinks when compiling" into oc-dev am:
6ea61f9c6d
am:
c69611fd86
Change-Id: Idd8ebb98c04fcfd061c36c2e5dcd678d88c5a267
Matthew Ng [Tue, 30 May 2017 13:56:11 +0000 (13:56 +0000)]
Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am:
9c4b6d3bff" into oc-dev-plus-aosp
am:
aa7e6a0d2b
Change-Id: If55011d13b78b80fc0eafbaa484f180a6eff0524
Jakub Pawlowski [Tue, 30 May 2017 13:53:52 +0000 (13:53 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." into oc-dev am:
e2b92e904c" into oc-dev-plus-aosp
am:
24a9e98a83
Change-Id: I17679cfa264f5ea4761b9a40867f4bbe1817b36e
Hall Liu [Tue, 30 May 2017 13:51:31 +0000 (13:51 +0000)]
Merge "Add new error codes in MbmsException" am:
8e7057ccf3 am:
20d98578f2 am:
aac7e3a182
am:
b2a5eceb2f
Change-Id: I4ecca51f60b02f31554dfab3efe0fed96f8b6ea8
Siyamed Sinir [Tue, 30 May 2017 13:40:53 +0000 (13:40 +0000)]
Merge "Dont try to autoSize if TextView is not measured" into oc-dev am:
42b2760525
am:
6a95c58508
Change-Id: Ib79628f6804350222b7d68b49e32aeb99f6cf39c
Jiaquan He [Tue, 30 May 2017 13:36:09 +0000 (13:36 +0000)]
Merge changes from topic 'highlight_fixed' into oc-dev am:
759669988b
am:
778523ca5c
Change-Id: Ida41d373fac39153c2f16c1508e81d231872d62b
Jiaquan He [Tue, 30 May 2017 13:34:35 +0000 (13:34 +0000)]
Check state_focus in foreground. am:
0bdf1c9c76
am:
74282f0745
Change-Id: I6266996179177f5812a82537510bf58e5c3f6b0d
Selim Cinek [Tue, 30 May 2017 13:30:59 +0000 (13:30 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev am:
7ddf54211f
am:
613ac93620
Change-Id: If2740716c8e5093176a839f880d8681109e63356
Andrii Kulian [Tue, 30 May 2017 13:28:29 +0000 (13:28 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev am:
e63965cef5
am:
83876c735e
Change-Id: I843e2469694c31ee23148ae09cb7b9c5d7506bfc
Jakub Pawlowski [Tue, 30 May 2017 13:26:19 +0000 (13:26 +0000)]
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp am:
658e1ddc7e" into oc-dev-plus-aosp
am:
8546ca67da
Change-Id: Ice5353450b11baef89c1bdd34ac44e8644139b86
Jiaquan He [Tue, 30 May 2017 13:23:52 +0000 (13:23 +0000)]
Merge "Fix the back button ripple." into oc-dev am:
a7914f24dd
am:
665d86a0fa
Change-Id: I27e94ab8e43fec9339cac03b49738069c1dbe206
Jakub Pawlowski [Tue, 30 May 2017 13:21:37 +0000 (13:21 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd am:
138f75bbc8
am:
bf79e36f57
Change-Id: I76b80aa77fa77fa66597fb94dcd8fef703a4f1ff
Yuka Anami [Tue, 30 May 2017 13:19:20 +0000 (13:19 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev am:
bb63b4a376
am:
0c7e85da54
Change-Id: Ieee8273e8a32b15e060be4ffd835f4a964c4b5ac
Ruchi Kandoi [Tue, 30 May 2017 13:17:11 +0000 (13:17 +0000)]
Merge "Make NFC AIDL callbacks oneway" am:
99c805b319 am:
a50b393781 am:
3377e1fc91
am:
cd9d36f665
Change-Id: Ia7d3be56ce538cbb40c72673b8c2824d0a76b82b
Yuka Anami [Tue, 30 May 2017 13:14:44 +0000 (13:14 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am:
b1f0bb6f83 am:
0d9dfc4314 am:
269cb38bb9
am:
50b8697071
Change-Id: I9fea9b4a931d334af711fa8e102594fb24f350fa
Sergey Vasilinets [Tue, 30 May 2017 13:11:47 +0000 (13:11 +0000)]
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev am:
bacaffa497
am:
6190ec9b03
Change-Id: I7287ab2c8e765620df72326383e9361e1561478b
Julius D'souza [Tue, 30 May 2017 13:09:33 +0000 (13:09 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev am:
f4abac4d8f -s ours
am:
d9251bad5b -s ours
Change-Id: Ia059d6a9eb146abedd2f05953c79362b457eab97
Julius D'souza [Tue, 30 May 2017 13:01:08 +0000 (13:01 +0000)]
Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission. am:
b9a71dfd38 -s ours
am:
eac7a439d0 -s ours
Change-Id: I75acd2db31e9bfd3297326800374858443743a35
Julia Reynolds [Tue, 30 May 2017 12:55:09 +0000 (12:55 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev am:
2c324042df
am:
f9d4e9428b
Change-Id: Ia55bfa05ebcf97262d9725028d67d3de5a4f33e5
Felipe Leme [Tue, 30 May 2017 12:50:44 +0000 (12:50 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev am:
3540463b74
am:
d51bf85e6c
Change-Id: I5a55fa8fbedfdeb3721a9b0c1e0c24c3602f2bfd
Amith Yamasani [Tue, 30 May 2017 12:41:10 +0000 (12:41 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev am:
22c2be0fbc
am:
85e6dd985b
Change-Id: I1c6e773427438e0474ca44ba49dddfcafdaea3da
Alan Viverette [Tue, 30 May 2017 12:35:32 +0000 (12:35 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev am:
bd8fb0e71d
am:
9c0108304c
Change-Id: Icbf1a40dee9adc71785f21d8d4ba0b3f78c3e3ed
Jason Monk [Tue, 30 May 2017 12:32:51 +0000 (12:32 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev am:
b25f52c042
am:
d58b721e55
Change-Id: I56b59ebb4d6c8c70fa1b9bf8810f921045c88d83
Selim Cinek [Tue, 30 May 2017 12:29:13 +0000 (12:29 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev am:
76926df97e
am:
f802c625ca
Change-Id: I281d04089f5ef83e22d0c15a25bacbc5dd1e4b34
Benoit Lamarche [Tue, 30 May 2017 12:25:57 +0000 (12:25 +0000)]
Merge "resolve merge conflicts of
daeafccfa962 to master"
Jason Monk [Fri, 26 May 2017 19:20:20 +0000 (15:20 -0400)]
resolve merge conflicts of
daeafccfa962 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39
Erik Kline [Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)]
Merge "Support "dumpsys connectivity tethering"" am:
6cdcba7b48 am:
06e6033327
am:
ff8b93f815
Change-Id: I68ff0810e4109c52e1d594a4b75fc768570ef59d
Erik Kline [Mon, 29 May 2017 08:48:38 +0000 (08:48 +0000)]
Merge "Support "dumpsys connectivity tethering"" am:
6cdcba7b48
am:
06e6033327
Change-Id: Ib88b17502c344314cb81d9c0167c2610e55d8313
Erik Kline [Mon, 29 May 2017 08:42:04 +0000 (08:42 +0000)]
Merge "Support "dumpsys connectivity tethering""
am:
6cdcba7b48
Change-Id: I91ef704d3fda346a50016841f40fecce2e23d215
Erik Kline [Mon, 29 May 2017 08:33:09 +0000 (08:33 +0000)]
Merge "Support "dumpsys connectivity tethering""
Joel Scherpelz [Mon, 29 May 2017 03:51:25 +0000 (03:51 +0000)]
Merge "Support requesting and receiving wakeup events" am:
bf152b14c4 am:
4971745cf4
am:
880974f111
Change-Id: I98aa768cf47938aa0996ddabbbc9feb9dae96f1e
Joel Scherpelz [Mon, 29 May 2017 03:41:23 +0000 (03:41 +0000)]
Merge "Support requesting and receiving wakeup events" am:
bf152b14c4
am:
4971745cf4
Change-Id: I1212c64e90572b7f45ca106c36ea89f37fb086ae
Joel Scherpelz [Mon, 29 May 2017 03:33:08 +0000 (03:33 +0000)]
Merge "Support requesting and receiving wakeup events"
am:
bf152b14c4
Change-Id: I594d4b5921ec6f0f8f73b88fd4d0e06278838553
Joel Scherpelz [Mon, 29 May 2017 03:28:00 +0000 (03:28 +0000)]
Merge "Support requesting and receiving wakeup events"
Erik Kline [Mon, 29 May 2017 00:11:03 +0000 (09:11 +0900)]
Support "dumpsys connectivity tethering"
Also print current upstream interface in tethering dump output.
Test: as follows
- build
- flashed
- booted
- runtest frameworks-net passes
- "dumpsys connectivity tethering" shows just tethering info
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I7f185fd71946a032e7f815207016294892df135d
Joel Scherpelz [Mon, 22 May 2017 04:47:41 +0000 (13:47 +0900)]
Support requesting and receiving wakeup events
Test: as follows
- built
- flashed
- booted
- ConnectivityServiceTest passes
Bug:
28806131
Change-Id: Ifc45260d5315479393da2c859ba4afed4e0e8c85
Erik Kline [Sun, 28 May 2017 11:31:32 +0000 (11:31 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration" am:
39ce589f0b am:
8211c36db9
am:
1315903420
Change-Id: I77b4db07f2a43a576146537ae2ab72d2d0ebdde6
Erik Kline [Sun, 28 May 2017 11:25:29 +0000 (11:25 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration" am:
39ce589f0b
am:
8211c36db9
Change-Id: Icf1f42b76998a3c7f4fd4285beb89e1310e5413d
Erik Kline [Sun, 28 May 2017 11:16:32 +0000 (11:16 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
am:
39ce589f0b
Change-Id: I1d61308cf21f3c4ebcc37f78bdd102f96a676462
Erik Kline [Sun, 28 May 2017 11:06:39 +0000 (11:06 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
Erik Kline [Fri, 19 May 2017 01:10:41 +0000 (10:10 +0900)]
Minor improvement in logging in TetheringConfiguration
Test: as follows
- built
- booted
- flashed
- runtest frameworks-net passes
- dumpsys connectivity shows expected output
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I4a2129d780dfec7bca693486a100ea3c78465430
Felipe Leme [Sat, 27 May 2017 02:30:30 +0000 (02:30 +0000)]
Merge "Improved autofillHints documentation." into oc-dev
am:
0b1b1c4346
Change-Id: I2aeaefde853f941263fcf677dfdcb3bffc6ab337
TreeHugger Robot [Sat, 27 May 2017 02:25:02 +0000 (02:25 +0000)]
Merge "Improved autofillHints documentation." into oc-dev
Adam Lesinski [Sat, 27 May 2017 01:51:55 +0000 (01:51 +0000)]
Merge "AAPT2: Follow symlinks when compiling" into oc-dev
am:
6ea61f9c6d
Change-Id: I18dc95b8adf503e0bf72e5b48036945dc95312de
TreeHugger Robot [Sat, 27 May 2017 01:43:46 +0000 (01:43 +0000)]
Merge "AAPT2: Follow symlinks when compiling" into oc-dev
TreeHugger Robot [Sat, 27 May 2017 01:36:49 +0000 (01:36 +0000)]
Merge "Scrim opacity varies based on notification count"
Android Build Merger (Role) [Sat, 27 May 2017 01:35:54 +0000 (01:35 +0000)]
Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am:
9c4b6d3bff" into oc-dev-plus-aosp
Matthew Ng [Sat, 27 May 2017 01:35:13 +0000 (01:35 +0000)]
Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev
am:
9c4b6d3bff
Change-Id: I9ce71c3f2434ef98d91161353c358e65c336e3bc
Android Build Merger (Role) [Sat, 27 May 2017 01:34:51 +0000 (01:34 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." into oc-dev am:
e2b92e904c" into oc-dev-plus-aosp
Jakub Pawlowski [Sat, 27 May 2017 01:33:59 +0000 (01:33 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." into oc-dev
am:
e2b92e904c
Change-Id: Iabcac8a4597e2913d461cafa179a8a79ce0e48d9
Hall Liu [Sat, 27 May 2017 01:31:58 +0000 (01:31 +0000)]
Merge "Add new error codes in MbmsException" am:
8e7057ccf3 am:
20d98578f2
am:
aac7e3a182
Change-Id: Ie426c6334590f30656166b0a7851fe75fa3d4684
TreeHugger Robot [Sat, 27 May 2017 01:29:41 +0000 (01:29 +0000)]
Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev
TreeHugger Robot [Sat, 27 May 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." into oc-dev
Hall Liu [Sat, 27 May 2017 01:25:28 +0000 (01:25 +0000)]
Merge "Add new error codes in MbmsException" am:
8e7057ccf3
am:
20d98578f2
Change-Id: If10d6d2df336be4e52a5b0c4d1bab6455de0f1ce
TreeHugger Robot [Sat, 27 May 2017 01:23:13 +0000 (01:23 +0000)]
Merge "Avoid locking in getCurrentUser when there is no user switch"
Hall Liu [Sat, 27 May 2017 01:18:33 +0000 (01:18 +0000)]
Merge "Add new error codes in MbmsException"
am:
8e7057ccf3
Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
Hall Liu [Sat, 27 May 2017 01:08:29 +0000 (01:08 +0000)]
Merge "Add new error codes in MbmsException"
Siyamed Sinir [Sat, 27 May 2017 00:27:58 +0000 (00:27 +0000)]
Merge "Dont try to autoSize if TextView is not measured" into oc-dev
am:
42b2760525
Change-Id: I737e9498b08de1a8447db39b194fe1640c721f2d
Jiaquan He [Sat, 27 May 2017 00:20:56 +0000 (00:20 +0000)]
Merge changes from topic 'highlight_fixed' into oc-dev
am:
759669988b
Change-Id: I1856f049fbb1f76e728f881c088579309b81a57c
Jiaquan He [Sat, 27 May 2017 00:19:35 +0000 (00:19 +0000)]
Check state_focus in foreground.
am:
0bdf1c9c76
Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53
Siyamed Sinir [Sat, 27 May 2017 00:13:33 +0000 (00:13 +0000)]
Merge "Don’t try to autoSize if TextView is not measured" into oc-dev
TreeHugger Robot [Sat, 27 May 2017 00:11:01 +0000 (00:11 +0000)]
Merge changes from topic 'highlight_fixed' into oc-dev
* changes:
Check default focus highlight for ImageView.
Check state_focus in foreground.
Adam Lesinski [Fri, 26 May 2017 23:31:38 +0000 (16:31 -0700)]
AAPT2: Follow symlinks when compiling
Bug:
62144459
Test: make AaptSymlinkTest
Change-Id: Idb3ab1ece17c52bb4fd174ec4c08a9e173289e55
Makoto Onuki [Fri, 26 May 2017 23:39:56 +0000 (23:39 +0000)]
Merge "Some service tests are missing size annotations"
Lucas Dupin [Thu, 25 May 2017 00:04:47 +0000 (17:04 -0700)]
Scrim opacity varies based on notification count
Test: visual
Bug:
62068907
Change-Id: I7055f47443bf6520e42c00797d5c76108a824465
Selim Cinek [Fri, 26 May 2017 23:38:48 +0000 (23:38 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
am:
7ddf54211f
Change-Id: I7cbee601bd0401e7ac20fdd2d2527f11dafcb068
Selim Cinek [Fri, 26 May 2017 23:32:11 +0000 (23:32 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
Andrii Kulian [Fri, 26 May 2017 23:25:23 +0000 (23:25 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am:
e63965cef5
Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0
Jakub Pawlowski [Fri, 26 May 2017 20:59:55 +0000 (13:59 -0700)]
Add 32 and 128 bit Service Data parsing.
Bug:
62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
(cherry picked from commit
45033a7e5799f2d957c7dad22eec0bfef94b3e16)
Android Build Merger (Role) [Fri, 26 May 2017 23:22:11 +0000 (23:22 +0000)]
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp am:
658e1ddc7e" into oc-dev-plus-aosp
Jakub Pawlowski [Fri, 26 May 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp
am:
658e1ddc7e
Change-Id: Ibe20b5786d5155d2e319c3c0620d1da64cbe14e6
Jiaquan He [Fri, 26 May 2017 23:19:16 +0000 (23:19 +0000)]
Merge "Fix the back button ripple." into oc-dev
am:
a7914f24dd
Change-Id: I35e474ed44380821278009945529474b6251c23b
Android Build Merger (Role) [Fri, 26 May 2017 23:17:28 +0000 (23:17 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp
Jakub Pawlowski [Fri, 26 May 2017 23:16:35 +0000 (23:16 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3
am:
2acc8e28dd
Change-Id: I3fe5c7c0baf273c9960a56640cd659abd990b858
Andrii Kulian [Fri, 26 May 2017 23:15:14 +0000 (23:15 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
Phil Weaver [Fri, 26 May 2017 23:14:55 +0000 (23:14 +0000)]
Merge "Stop populating accessibility nodes with events"
Jakub Pawlowski [Fri, 26 May 2017 23:14:27 +0000 (23:14 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd
am:
138f75bbc8
Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa
TreeHugger Robot [Fri, 26 May 2017 23:10:44 +0000 (23:10 +0000)]
Merge "Fix the back button ripple." into oc-dev
Jakub Pawlowski [Fri, 26 May 2017 23:09:23 +0000 (23:09 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3
am:
2acc8e28dd
Change-Id: I54a5717690a43e03b2390e1413e06e9c35554e28
Jakub Pawlowski [Fri, 26 May 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
am:
725e212de3
Change-Id: I5a5010651b07f2a9c5d1fb25f55602ed5e741d56
Yuka Anami [Fri, 26 May 2017 22:58:49 +0000 (22:58 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
am:
bb63b4a376
Change-Id: I923cb6ed3b459f092a24211f7e18076d248ae615
Treehugger Robot [Fri, 26 May 2017 22:53:27 +0000 (22:53 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
TreeHugger Robot [Fri, 26 May 2017 22:51:55 +0000 (22:51 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
Hall Liu [Fri, 26 May 2017 22:49:32 +0000 (15:49 -0700)]
Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
Sudheer Shanka [Fri, 26 May 2017 22:47:51 +0000 (22:47 +0000)]
Merge "Allow ManagedProvisioning to silently uninstall apps"
Ruchi Kandoi [Fri, 26 May 2017 22:45:24 +0000 (22:45 +0000)]
Merge "Make NFC AIDL callbacks oneway" am:
99c805b319 am:
a50b393781
am:
3377e1fc91
Change-Id: I95e5adffea2ed0d288041ccd357aac7763994359
Ruchi Kandoi [Fri, 26 May 2017 22:37:26 +0000 (22:37 +0000)]
Merge "Make NFC AIDL callbacks oneway" am:
99c805b319
am:
a50b393781
Change-Id: I510c06bb3c3fc74ec31baa6b5d3e3c2888067da6
Yuka Anami [Fri, 26 May 2017 22:30:19 +0000 (22:30 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am:
b1f0bb6f83 am:
0d9dfc4314
am:
269cb38bb9
Change-Id: I8bf7940e14a0f2177ff46ef91575922b48716351
Ruchi Kandoi [Fri, 26 May 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Make NFC AIDL callbacks oneway"
am:
99c805b319
Change-Id: I964420fc36c67b9f96e286e1a8b9b54eda074189
Tor Norbye [Fri, 26 May 2017 22:25:55 +0000 (22:25 +0000)]
Merge "@IntDef and @StringDef must have source retention"
Yuka Anami [Fri, 26 May 2017 22:23:53 +0000 (22:23 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am:
b1f0bb6f83
am:
0d9dfc4314
Change-Id: I8e3caa6df525879b820f0611ec751d18df3eb94f
Treehugger Robot [Fri, 26 May 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Make NFC AIDL callbacks oneway"
Yuka Anami [Fri, 26 May 2017 22:17:15 +0000 (22:17 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
am:
b1f0bb6f83
Change-Id: Ib63ba83f912f2047ec5bd795b57da423c1e78f59