OSDN Git Service
Chih-hung Hsieh [Wed, 28 Sep 2016 04:22:56 +0000 (04:22 +0000)]
Merge "Fix Google pylint warnings." am:
aa5f2ccde2 am:
2d06a27ae6
am:
9e0609ee36
Change-Id: Id5152ca1676935175d7a5c911b128d7e4b312aae
Chih-hung Hsieh [Wed, 28 Sep 2016 04:19:56 +0000 (04:19 +0000)]
Merge "Fix Google pylint warnings." am:
aa5f2ccde2
am:
2d06a27ae6
Change-Id: Id90eacb4b5316ac1cecd4c8578127fbf6a1c5102
Chih-hung Hsieh [Wed, 28 Sep 2016 04:17:25 +0000 (04:17 +0000)]
Merge "Fix Google pylint warnings."
am:
aa5f2ccde2
Change-Id: Ide1a5bffa1745737142ffde982268addd8c253bb
Chih-hung Hsieh [Wed, 28 Sep 2016 04:10:26 +0000 (04:10 +0000)]
Merge "Fix Google pylint warnings."
Dan Willemsen [Wed, 28 Sep 2016 01:57:47 +0000 (01:57 +0000)]
Merge "Remove WITH_SYNTAX_CHECK" am:
c114bd9dbf am:
d640e062e8
am:
28d50c498b
Change-Id: I335a3b87e3e7e75be9b2a2c2031388609d69c057
Dan Willemsen [Wed, 28 Sep 2016 01:55:17 +0000 (01:55 +0000)]
Merge "Remove WITH_SYNTAX_CHECK" am:
c114bd9dbf
am:
d640e062e8
Change-Id: Ia808c46ce1089210eaa5db02b446cfca0ed5cdde
Dan Willemsen [Wed, 28 Sep 2016 01:52:16 +0000 (01:52 +0000)]
Merge "Remove WITH_SYNTAX_CHECK"
am:
c114bd9dbf
Change-Id: I9e6c2a9c6aa48e27efe9b32d496ca21f47d4a447
Treehugger Robot [Wed, 28 Sep 2016 01:44:23 +0000 (01:44 +0000)]
Merge "Remove WITH_SYNTAX_CHECK"
Chih-Hung Hsieh [Wed, 28 Sep 2016 01:08:52 +0000 (18:08 -0700)]
Fix Google pylint warnings.
* Rename 'severity' to 'Severity'.
* Fix bad line indentations and space.
Test: run warn.py --byproject build.log
Change-Id: I33d701cca408b5ca4715be8d44c890942b7d132a
Chih-Hung Hsieh [Tue, 27 Sep 2016 21:25:39 +0000 (21:25 +0000)]
Merge "Add buttons to group warning by project or severity." am:
9796175d0f am:
9dee2ac43c
am:
3791e7b242
Change-Id: Ia47f5be94cfc37d2bb934eef97a3b9f860a0d139
Chih-Hung Hsieh [Tue, 27 Sep 2016 21:22:40 +0000 (21:22 +0000)]
Merge "Add buttons to group warning by project or severity." am:
9796175d0f
am:
9dee2ac43c
Change-Id: I10ff9eb5c01a9d594ccc3332b5a8daaf673705c8
Chih-Hung Hsieh [Tue, 27 Sep 2016 21:20:12 +0000 (21:20 +0000)]
Merge "Add buttons to group warning by project or severity."
am:
9796175d0f
Change-Id: I4d016ce0450870351a0454314f43d0cf75487993
Treehugger Robot [Tue, 27 Sep 2016 21:10:40 +0000 (21:10 +0000)]
Merge "Add buttons to group warning by project or severity."
Evgenii Stepanov [Tue, 27 Sep 2016 21:04:26 +0000 (21:04 +0000)]
Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG." am:
2358c55d70 am:
04b11c5acd
am:
9eddd0620c
Change-Id: I06999b22af259785258e6b198c439c3538023f6a
Evgenii Stepanov [Tue, 27 Sep 2016 21:01:26 +0000 (21:01 +0000)]
Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG." am:
2358c55d70
am:
04b11c5acd
Change-Id: Iafb3730cc96056b09e26fa95e9bf9e73588d4315
Evgenii Stepanov [Tue, 27 Sep 2016 20:58:56 +0000 (20:58 +0000)]
Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG."
am:
2358c55d70
Change-Id: Ib36748ff1fe5f8bad82b37d27f9d1a94d5a8e0ee
Evgenii Stepanov [Tue, 27 Sep 2016 20:51:41 +0000 (20:51 +0000)]
Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG."
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:19:11 +0000 (09:19 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs. am:
a7edd92c45 am:
ea14cfba0f am:
6169f2b065
am:
420ba30adb
Change-Id: Idcc6f0735895c86e22ed49818e1b1f77454b59fe
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:16:41 +0000 (09:16 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs. am:
a7edd92c45 am:
ea14cfba0f
am:
6169f2b065
Change-Id: I328b66a8a08126baeaa38a66d888dcf0521c6976
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:13:40 +0000 (09:13 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs. am:
a7edd92c45
am:
ea14cfba0f
Change-Id: Ida650d1d4f8afc8eb05c1df4109fcb4f0ca5dbb1
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:11:55 +0000 (09:11 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs. am:
a7edd92c45
am:
8bcdd9a36c
Change-Id: Idf0ddf51b41549c55336a2c583d0f6199165284c
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:11:55 +0000 (09:11 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs.
am:
a7edd92c45
Change-Id: I5759d442e038f31105c249250ce3474564d7954c
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:08:40 +0000 (09:08 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs.
am:
a7edd92c45
Change-Id: Iaef35c55e7af6f27a12944491026ee45b5ef8312
Dan Willemsen [Tue, 27 Sep 2016 01:27:11 +0000 (01:27 +0000)]
Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS" am:
f69e48b30b am:
785d69a849
am:
b4b610278b
Change-Id: Ia2891d68f9c20af23fb7ab4a0014a8c74104cfad
Dan Willemsen [Tue, 27 Sep 2016 01:24:11 +0000 (01:24 +0000)]
Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS" am:
f69e48b30b
am:
785d69a849
Change-Id: I5362a422641f40c3472d3a7506cc8a6354b8a09a
Dan Willemsen [Tue, 27 Sep 2016 01:22:11 +0000 (01:22 +0000)]
Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS"
am:
f69e48b30b
Change-Id: I63e8c0dc06332c620b16fdb27b396b39ad2d44cf
Treehugger Robot [Tue, 27 Sep 2016 01:10:30 +0000 (01:10 +0000)]
Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS"
Dan Willemsen [Tue, 27 Sep 2016 00:37:19 +0000 (17:37 -0700)]
Remove WITH_SYNTAX_CHECK
It's no longer used. The majority of the platform is on clang anyways.
Test: m -j
Change-Id: I4fb4375eaad2469e169d34c47ae3fe2a0540aeec
Iliyan Malchev [Tue, 27 Sep 2016 00:16:42 +0000 (00:16 +0000)]
Merge "build: add hwservicemanager to the core packages" am:
69bd0bf22a am:
3f044f007f
am:
a65c0d3481
Change-Id: If5968ce47c39b5fd55f30893550d581d4c04e414
Iliyan Malchev [Tue, 27 Sep 2016 00:12:12 +0000 (00:12 +0000)]
Merge "build: add hwservicemanager to the core packages" am:
69bd0bf22a
am:
3f044f007f
Change-Id: I4d7af1e21242752e8c0c9a9822d31e2efdbecd81
Iliyan Malchev [Tue, 27 Sep 2016 00:08:15 +0000 (00:08 +0000)]
Merge "build: add hwservicemanager to the core packages"
am:
69bd0bf22a
Change-Id: Icd688e7e59c95ae91787c9f35e5c3d814062b1ce
Treehugger Robot [Mon, 26 Sep 2016 23:54:53 +0000 (23:54 +0000)]
Merge "build: add hwservicemanager to the core packages"
Dan Willemsen [Mon, 26 Sep 2016 22:43:45 +0000 (15:43 -0700)]
Remove spaces from DEFAULT_TIDY_HEADER_DIRS
I'm preparing to move this to Soong, and it's simpler to compare if the
spaces are removed here (to match the other lists in this file).
Test: WITH_TIDY=true; compare build.ninja before and after change
Change-Id: Ib27a19a36ebb1132300a8c1eeace1202685dfc4c
Chih-Hung Hsieh [Fri, 23 Sep 2016 02:22:07 +0000 (19:22 -0700)]
Add buttons to group warning by project or severity.
* Add more project patterns.
* Add more top level comments for global variables and functions.
* Resequence severity numbers to match the dump order.
* Emit warning messages and tables to static HTML JavaScript arrays.
* Replace old static HTML table dumper functions with
new dynamic HTML JavaScript to generate sections of warnings.
* Warning messages are grouped into sections by severity or projects.
* Better descriptions for SKIP warning patterns.
* Replace output function with print.
Bug:
31377083
Test: run warn.py --byproject build.log
Change-Id: I7b44ef6223d5b2f1aa31655a5a47d854f9a1dedc
Chih-Hung Hsieh [Mon, 26 Sep 2016 21:27:55 +0000 (21:27 +0000)]
Merge "Fix Google pylint warnings." am:
bcd229277a am:
64af14a4d2
am:
14a22e9222
Change-Id: I6ef533be4ce3c798a4ff4c7d7364b3b3f5b81e49
Chih-Hung Hsieh [Mon, 26 Sep 2016 21:25:25 +0000 (21:25 +0000)]
Merge "Fix Google pylint warnings." am:
bcd229277a
am:
64af14a4d2
Change-Id: I332da66829738d6793ca1795103f903271f235c6
Chih-Hung Hsieh [Mon, 26 Sep 2016 21:22:56 +0000 (21:22 +0000)]
Merge "Fix Google pylint warnings."
am:
bcd229277a
Change-Id: Ia7948dfee4dbb48957c4e0ab4b5517e4d9cff71e
Iliyan Malchev [Mon, 19 Sep 2016 22:20:14 +0000 (15:20 -0700)]
build: add hwservicemanager to the core packages
b/
31458381
b/
31240290
Test: passing build and runtime tests
Change-Id: I294c70d93d23ada94ff1175f2d3babd5b836eeee
Signed-off-by: Iliyan Malchev <malchev@google.com>
Treehugger Robot [Mon, 26 Sep 2016 21:18:07 +0000 (21:18 +0000)]
Merge "Fix Google pylint warnings."
Chih-Hung Hsieh [Mon, 26 Sep 2016 17:56:43 +0000 (10:56 -0700)]
Fix Google pylint warnings.
* Rename variables and functions to follow Google coding style.
* Fix line indentations to follow Google coding style.
* Add module and function docstrings.
* Change shebang line to avoid pylint warning.
* Suppress some pylint warnings to avoid too many changes at once.
* Fix typos.
Test: run warn.py --byproject build.log
Change-Id: I569961981b562e35cb5609a96cd5ebb40a80829c
Przemyslaw Szczepaniak [Mon, 26 Sep 2016 15:21:13 +0000 (16:21 +0100)]
Fix for non-empty a[name] tags in openJdk based javadocs.
openJdk based android javadoc contains <a name=... tags
that are non-empty. Currently they are being hidden,
causing badly formatted pages for some java.* classes
(missing text and random whitespace blocks).
This change makes the existing a[name] hiding rule
apply only to empty tags.
Test: make docs
Bug:
31700998
Change-Id: Ifa75bbabe308d7aed0cce6165c1113e5a382a121
Chih-Hung Hsieh [Fri, 23 Sep 2016 04:40:43 +0000 (04:40 +0000)]
Merge "Recognize new warning messages." am:
b0553ca65b am:
d95f164112
am:
b6e37662ba
Change-Id: Iaa46479649224d5b8e05d69d9af57aedd3d396c7
Dan Willemsen [Fri, 23 Sep 2016 04:38:54 +0000 (04:38 +0000)]
Merge "link_type check: Support modules installed into /data" am:
8870658397 am:
6d720a64c7
am:
5df1b50242
Change-Id: I7ab6dc73cda11e6a5f14dd9c21e4a04da94c592f
Chih-Hung Hsieh [Fri, 23 Sep 2016 04:38:41 +0000 (04:38 +0000)]
Merge "Recognize new warning messages." am:
b0553ca65b
am:
d95f164112
Change-Id: I063024bfa1bf1ad1ef516905ec04a0902cc840c1
Dan Willemsen [Fri, 23 Sep 2016 04:38:41 +0000 (04:38 +0000)]
link_type check: Support modules installed into /data am:
3594cee467 am:
16448d0b27
am:
3888162616
Change-Id: I9ed0dd964a51d4b2c5be4ccff2e7191160a73644
Dan Willemsen [Fri, 23 Sep 2016 04:37:25 +0000 (04:37 +0000)]
Merge "link_type check: Support modules installed into /data" am:
8870658397
am:
6d720a64c7
Change-Id: Ia4490684199bcf8d96b36f0a65c160ffe51d8d24
Chih-Hung Hsieh [Fri, 23 Sep 2016 04:37:12 +0000 (04:37 +0000)]
Merge "Recognize new warning messages."
am:
b0553ca65b
Change-Id: Ic2f262f62121e19e1daba9a0a3c95fd6ebcc2b1a
Dan Willemsen [Fri, 23 Sep 2016 04:37:11 +0000 (04:37 +0000)]
link_type check: Support modules installed into /data am:
3594cee467
am:
16448d0b27
Change-Id: If1fc6d6d584dd5b58b2a8b84ad7e819d4d6d127b
Dan Willemsen [Fri, 23 Sep 2016 04:35:14 +0000 (04:35 +0000)]
Merge "link_type check: Support modules installed into /data"
am:
8870658397
Change-Id: I73b1dcc5296c2ed3b3dec9d5be0adb3645fd5ded
Dan Willemsen [Fri, 23 Sep 2016 04:35:13 +0000 (04:35 +0000)]
link_type check: Support modules installed into /data
am:
3594cee467
Change-Id: I3735c05d317aa5c125471c7e91124cd45ebe4a98
Treehugger Robot [Fri, 23 Sep 2016 04:33:11 +0000 (04:33 +0000)]
Merge "Recognize new warning messages."
Treehugger Robot [Fri, 23 Sep 2016 04:30:02 +0000 (04:30 +0000)]
Merge "link_type check: Support modules installed into /data"
Chih-Hung Hsieh [Wed, 21 Sep 2016 21:00:23 +0000 (14:00 -0700)]
Recognize new warning messages.
* -Wunnamed-type-template-args and -W#pragma-messages
Test: run warn.py with build.log.
Change-Id: I36277e001081604f92a4d9c92f9a0b5d3f0ee5e5
Dan Willemsen [Fri, 23 Sep 2016 00:25:14 +0000 (00:25 +0000)]
Merge "Pass userdebug/eng variant to Soong" am:
19f24492db am:
7ebc69e881
am:
2ffe3d83fe
Change-Id: I244dccec37fc00e5f1a3473de332dfeb0e4d8758
Dan Willemsen [Fri, 23 Sep 2016 00:23:17 +0000 (00:23 +0000)]
Merge "Pass userdebug/eng variant to Soong" am:
19f24492db
am:
7ebc69e881
Change-Id: Ib3524a0f7e8634164ab77a10873f0e3afb4e47f1
Dan Willemsen [Fri, 23 Sep 2016 00:21:40 +0000 (00:21 +0000)]
Merge "Pass userdebug/eng variant to Soong"
am:
19f24492db
Change-Id: Ic13d60a9bf2c036f3d1babcecda6c5b50c5e9a69
Treehugger Robot [Fri, 23 Sep 2016 00:16:52 +0000 (00:16 +0000)]
Merge "Pass userdebug/eng variant to Soong"
Chih-Hung Hsieh [Fri, 23 Sep 2016 00:15:11 +0000 (00:15 +0000)]
Merge "Simplify warn.py and output of warning count table and tablerow." am:
eac773047f am:
d7f5496a7c
am:
693c1baa15
Change-Id: I5830b4e416df88c5988bf2564c5d7461fd68626f
Chih-Hung Hsieh [Fri, 23 Sep 2016 00:13:41 +0000 (00:13 +0000)]
Merge "Simplify warn.py and output of warning count table and tablerow." am:
eac773047f
am:
d7f5496a7c
Change-Id: Ia434a91fd21427107170931bc7a6dd26199754f1
Chih-Hung Hsieh [Fri, 23 Sep 2016 00:11:13 +0000 (00:11 +0000)]
Merge "Simplify warn.py and output of warning count table and tablerow."
am:
eac773047f
Change-Id: I25da893dc7add3c92fda9fe003a2cd23f9971e36
Treehugger Robot [Fri, 23 Sep 2016 00:06:26 +0000 (00:06 +0000)]
Merge "Simplify warn.py and output of warning count table and tablerow."
Dirk Dougherty [Thu, 22 Sep 2016 22:42:36 +0000 (22:42 +0000)]
Support "ID" lang code in place of "IN". am:
fc61720cd5 am:
1e3157760a am:
4f4060398b
am:
a57fa8b2f9
Change-Id: Ibb7c22b2700a0513641381cd119813d7e460fd17
Dirk Dougherty [Thu, 22 Sep 2016 22:25:38 +0000 (22:25 +0000)]
Support "ID" lang code in place of "IN". am:
fc61720cd5 am:
1e3157760a
am:
4f4060398b
Change-Id: Ibbf7dae4de81f65b4caa9f433be5f144d251c449
Dan Willemsen [Thu, 22 Sep 2016 21:52:53 +0000 (14:52 -0700)]
Pass userdebug/eng variant to Soong
Test: Run build with eng/userdebug/user and check the soong.variables
Change-Id: I7cd71a94e92526b6cc61303b13b7bc593cbbfc3a
Dirk Dougherty [Thu, 22 Sep 2016 22:18:04 +0000 (22:18 +0000)]
Support "ID" lang code in place of "IN". am:
fc61720cd5
am:
992ceaad75
Change-Id: Ic003d4fb88047791c4b2272e03bc6c850e652962
Benoit Lamarche [Thu, 22 Sep 2016 22:17:50 +0000 (22:17 +0000)]
Merge changes from topic 'jack-d-b3-as-stable' am:
52eafee87a am:
95cea98863
am:
e1da6f7a87
Change-Id: Ic0bc8af24b37aed9f92fa785586820281126c95a
Chih-Hung Hsieh [Thu, 22 Sep 2016 20:43:12 +0000 (13:43 -0700)]
Simplify warn.py and output of warning count table and tablerow.
* Use a loop to initialize empty 'members' and 'option' of warnpatterns.
* Create severity.{color,columnheader,header} from an attributes list.
* Compute totalbyproject and totalbyseverity from a constructor.
* Skip all-zero rows and columns in the warning count table.
* Remove redundant spaces and newlines in tablerow output.
Test: run through build.log files
Change-Id: I4d3fa4ecd92e1afab91d85b7535d03f8696e83d8
Yohann Roussel [Thu, 22 Sep 2016 22:14:47 +0000 (22:14 +0000)]
Fix bad JACK_PLUGIN variable am:
16243bdbec am:
fa887390aa
am:
cbe1913c78
Change-Id: I38a75ae28b9994832b5cfcfb053c67cd49ed834c
Yohann Roussel [Thu, 22 Sep 2016 22:14:39 +0000 (22:14 +0000)]
Add support for Jack plugin am:
53b7fbbe78 am:
be50693fc1
am:
62e67d1bff
Change-Id: I7cf2db9ccd9bfe03ec1394340b2683b014e7dde5
Dirk Dougherty [Thu, 22 Sep 2016 22:00:32 +0000 (22:00 +0000)]
Support "ID" lang code in place of "IN". am:
fc61720cd5
am:
1e3157760a
Change-Id: I3c4a30979509fe8ddd2f9ca1e22834bf03add68e
Dirk Dougherty [Thu, 22 Sep 2016 21:54:37 +0000 (21:54 +0000)]
Support "ID" lang code in place of "IN".
am:
fc61720cd5
Change-Id: If9670423332a3c785cc7b7ddc5e53b524f9e4e7d
Dirk Dougherty [Thu, 22 Sep 2016 20:08:54 +0000 (20:08 +0000)]
Support "ID" lang code in place of "IN".
am:
fc61720cd5
Change-Id: I5b83ffec940a6b0c0d613955027b7b0668cbe589
Dan Willemsen [Thu, 22 Sep 2016 17:56:36 +0000 (10:56 -0700)]
link_type check: Support modules installed into /data
Test: compare build.ninja before/after, look at warnings.html
Change-Id: I1b78748dd80b73d2601b2adf0aaac8a6b2b350d5
Benoit Lamarche [Thu, 22 Sep 2016 11:47:56 +0000 (11:47 +0000)]
Merge changes from topic 'jack-d-b3-as-stable' am:
52eafee87a
am:
95cea98863
Change-Id: I73136c06aafd0d57192c62a9eeb262de85e00121
Yohann Roussel [Thu, 22 Sep 2016 11:46:09 +0000 (11:46 +0000)]
Fix bad JACK_PLUGIN variable am:
16243bdbec
am:
fa887390aa
Change-Id: I50ffe581aa848fd1b1fe3109eacd19dce4049632
Yohann Roussel [Thu, 22 Sep 2016 11:46:01 +0000 (11:46 +0000)]
Add support for Jack plugin am:
53b7fbbe78
am:
be50693fc1
Change-Id: I67172f4e42cca74f793426912cc8b0ff036bf47c
Benoit Lamarche [Thu, 22 Sep 2016 09:43:29 +0000 (09:43 +0000)]
Merge changes from topic 'jack-d-b3-as-stable'
am:
52eafee87a
Change-Id: I7e4fb947fe8f2c5ea8d1091583c468f8c9ca3d35
Yohann Roussel [Thu, 22 Sep 2016 09:41:30 +0000 (09:41 +0000)]
Fix bad JACK_PLUGIN variable
am:
16243bdbec
Change-Id: Ic0c8dfc081ce1bc0a267474bf1ce7d3ca3dfbb03
Yohann Roussel [Thu, 22 Sep 2016 09:41:22 +0000 (09:41 +0000)]
Add support for Jack plugin
am:
53b7fbbe78
Change-Id: Idec54986c0afe10973c464c6edb533321441eea7
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge changes from topic 'jack-d-b3-as-stable'
* changes:
Fix bad JACK_PLUGIN variable
Add support for Jack plugin
Dirk Dougherty [Thu, 22 Sep 2016 01:29:18 +0000 (18:29 -0700)]
Support "ID" lang code in place of "IN".
Change-Id: I56632e638fdda81e494cbb7080502b35393a291f
Dan Willemsen [Wed, 21 Sep 2016 19:53:20 +0000 (19:53 +0000)]
Merge "Package up proguard jack_dictionary" am:
f7d1a6d75f am:
e875b39791
am:
f56a3b2513
Change-Id: Ide4c2d7d17adabdc8375f14d3676f1d6b8e455f4
Dan Willemsen [Wed, 21 Sep 2016 19:50:50 +0000 (19:50 +0000)]
Merge "Package up proguard jack_dictionary" am:
f7d1a6d75f
am:
e875b39791
Change-Id: Ibe68192917534f603872e698131534e55973edae
Dan Willemsen [Wed, 21 Sep 2016 19:48:20 +0000 (19:48 +0000)]
Merge "Package up proguard jack_dictionary"
am:
f7d1a6d75f
Change-Id: Ia426e7d0fea6d0c6fc610d9d9fed20c9d2159ed6
Dan Willemsen [Wed, 21 Sep 2016 19:39:47 +0000 (19:39 +0000)]
Merge "Package up proguard jack_dictionary"
Android Build Merger (Role) [Wed, 21 Sep 2016 18:34:56 +0000 (18:34 +0000)]
Merge "Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405 am:
ceda55a70c am:
b1c348827f am:
514aa651e8 am:
3e206a84ff" into nyc-mr1-dev-plus-aosp
Adam Seaton [Wed, 21 Sep 2016 18:34:48 +0000 (18:34 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405 am:
ceda55a70c am:
b1c348827f am:
514aa651e8
am:
3e206a84ff
Change-Id: I39dfe685fd744b270a13db3b92e94a7bc60874c0
Android Build Merger (Role) [Wed, 21 Sep 2016 18:34:44 +0000 (18:34 +0000)]
Adam Seaton [Wed, 21 Sep 2016 18:34:36 +0000 (18:34 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe am:
7bdb62e453 am:
f48e1e6cb3 am:
1cfca4d3e3
am:
7d285b4153
Change-Id: Ia0db1f3b79b44241784fd3ba73e96bf47628fc1a
Adam Seaton [Wed, 21 Sep 2016 18:34:35 +0000 (18:34 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405 am:
ceda55a70c
am:
61ce7e2425
Change-Id: Ie625e9686515ed65fe6c0e351ce4e12e890b2b9e
Adam Seaton [Wed, 21 Sep 2016 18:33:04 +0000 (18:33 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405 am:
ceda55a70c am:
b1c348827f
am:
514aa651e8
Change-Id: I0d500037f2bfbddfd415bccdda6d72757cf1aebc
Adam Seaton [Wed, 21 Sep 2016 18:32:05 +0000 (18:32 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405 am:
ceda55a70c
am:
b1c348827f
Change-Id: Ia8343fb817b7cd07399c41dd702bc83c042e0336
Adam Seaton [Wed, 21 Sep 2016 18:32:05 +0000 (18:32 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe am:
7bdb62e453
am:
e8f26b5a83
Change-Id: I0fce7b685020eca0c73bbfdce0b7fa5989c87e10
Adam Seaton [Wed, 21 Sep 2016 18:32:05 +0000 (18:32 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe am:
7bdb62e453 am:
f48e1e6cb3
am:
1cfca4d3e3
Change-Id: I72374aea3766e30c3f56d9ea2698c56aac397410
Adam Seaton [Wed, 21 Sep 2016 18:28:15 +0000 (18:28 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe am:
7bdb62e453
am:
f48e1e6cb3
Change-Id: I5842754fd4ae0fe88e86935510b101b92d65547f
Adam Seaton [Wed, 21 Sep 2016 18:27:42 +0000 (18:27 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405
am:
ceda55a70c
Change-Id: I85a55326c07e27a78e37dc91d4fde241abc8aa40
Adam Seaton [Wed, 21 Sep 2016 18:27:05 +0000 (18:27 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe
am:
7bdb62e453
Change-Id: I031149cea0deffbc575799abd7a7d3adb4aafe8f
Adam Seaton [Wed, 21 Sep 2016 18:27:04 +0000 (18:27 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405
am:
ceda55a70c
Change-Id: I2fdef44649c093e248976cb1a99bf08dcec4bf90
Adam Seaton [Wed, 21 Sep 2016 18:24:04 +0000 (18:24 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b
am:
5fd0f92405
Change-Id: I673419ace743bdffeb04f671f25a0d8f43594925
Adam Seaton [Wed, 21 Sep 2016 18:24:04 +0000 (18:24 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe
am:
7bdb62e453
Change-Id: Ibdff0bc717c5da544cf1303c366d9c0187b95f30