Chih-Hung Hsieh
|
1dd22051b1
|
resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp
am: 0a87059452
* commit '0a870594527a3af036b1238983abfe4e6118178b':
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Change-Id: I84afca734f9bf0cf4b9d503b17878d13f5a2b29c
|
2016-05-19 23:29:27 +00:00 |
|
Android Build Merger (Role)
|
0cf5b8d0fe
|
Merge "Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837" into nyc-dev-plus-aosp
|
2016-05-19 23:26:35 +00:00 |
|
Dirk Dougherty
|
21c24e63bf
|
Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246
am: f339170837
* commit 'f3391708373758acac5d4c8daf3abe9ca2a38b97':
Remove outdated google services links.
Change-Id: Ib4dd699dd767dac910af70eb32471570291af482
|
2016-05-19 23:26:08 +00:00 |
|
Dirk Dougherty
|
0720f5885e
|
Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246
am: f339170837
* commit 'f3391708373758acac5d4c8daf3abe9ca2a38b97':
Remove outdated google services links.
Change-Id: I89b08725b84a2618f5a2af0cf216f02b39ee53ad
|
2016-05-19 23:25:42 +00:00 |
|
Adam Lesinski
|
6f4b566169
|
Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."
|
2016-05-19 23:25:09 +00:00 |
|
Treehugger Robot
|
fe91d2a83d
|
Merge "Fix misc-macro-parentheses warnings in services jni."
|
2016-05-19 23:24:03 +00:00 |
|
Chih-Hung Hsieh
|
0a87059452
|
resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
|
2016-05-19 16:22:09 -07:00 |
|
Dirk Dougherty
|
f339170837
|
Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc
am: 8053c79246
* commit '8053c79246f14a78158b6476169299999299d6d8':
Remove outdated google services links.
Change-Id: I4c85952e4962381261e42d3ecf1c3408a57ab55e
|
2016-05-19 23:19:12 +00:00 |
|
Dirk Dougherty
|
8053c79246
|
Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9
am: 5fb577e6bc
* commit '5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
Remove outdated google services links.
Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
|
2016-05-19 23:13:57 +00:00 |
|
John Reck
|
bb08e42570
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours am: 02b5805ba3
am: 93510f46e0
* commit '93510f46e0f4be83fae3a81fb7aac61de8728b42':
Change-Id: I91db9913f0ffc3e75cf0c30b2fed5dd65e32e2fd
|
2016-05-19 23:13:16 +00:00 |
|
John Reck
|
1ace036605
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours am: 02b5805ba3
am: 3a3973d263
* commit '3a3973d263137315e998564a461c54692f39cc06':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I31ee32d36cedc4b0138b9d0ce55dd656bd9915aa
|
2016-05-19 23:10:33 +00:00 |
|
John Reck
|
93510f46e0
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours
am: 02b5805ba3
* commit '02b5805ba3f5567ef6eea5931f120fd261cd4a54':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I753de859a133ded85cb89fb914bbe29e195a3432
|
2016-05-19 23:07:15 +00:00 |
|
Dirk Dougherty
|
5fb577e6bc
|
Merge "Remove outdated google services links." into mnc-mr-docs
am: dc40b80ae9
* commit 'dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
Remove outdated google services links.
Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
|
2016-05-19 23:07:10 +00:00 |
|
Chih-Hung Hsieh
|
404e2b21fc
|
Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni."
am: e66235bf00
* commit 'e66235bf00a695cacb44b0bc1a241cabb7de3b96':
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Change-Id: I08ab0efc29e8b595f087a781d8a66a472f1f9797
|
2016-05-19 23:07:09 +00:00 |
|
John Reck
|
3a3973d263
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours
am: 02b5805ba3
* commit '02b5805ba3f5567ef6eea5931f120fd261cd4a54':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Id1ae8b8ead92837ef43e9e40aeac8696fe8a6e76
|
2016-05-19 23:06:25 +00:00 |
|
Bert McMeen
|
2a54e47a5d
|
docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e am: 8386df9ea1
am: 00df4e8cf3
* commit '00df4e8cf3c00486091f67da26598fded57a5c03':
Change-Id: Ic555774a27d71339ba51bfd136f18ae86d1ffe6f
|
2016-05-19 23:03:52 +00:00 |
|
Treehugger Robot
|
e66235bf00
|
Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni."
|
2016-05-19 23:02:55 +00:00 |
|
Dirk Dougherty
|
dc40b80ae9
|
Merge "Remove outdated google services links." into mnc-mr-docs
|
2016-05-19 23:01:54 +00:00 |
|
Dirk Dougherty
|
8b35261e90
|
Remove outdated google services links.
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
|
2016-05-19 16:00:56 -07:00 |
|
Bert McMeen
|
b1d6983b2f
|
docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e am: 8386df9ea1
am: bf5dd7b969
* commit 'bf5dd7b9693a5a9f5165ba78e27c8500642ef6f6':
docs: Update to column widths for Complications table
Change-Id: Id00f7931635bc02a95dd5ac8e4e9549a4367ee6f
|
2016-05-19 22:59:52 +00:00 |
|
John Reck
|
02b5805ba3
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197
am: 7298186769 -s ours
* commit '7298186769395978045ed2d35252cdf7f644d85b':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I93f337a4e85a4e20e91fbbf7bd7aeb48bd0df735
|
2016-05-19 22:59:26 +00:00 |
|
Bert McMeen
|
00df4e8cf3
|
docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e
am: 8386df9ea1
* commit '8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
docs: Update to column widths for Complications table
Change-Id: I9a282a4b7f4b75ea6b51939afc516960bb690161
|
2016-05-19 22:57:08 +00:00 |
|
Bert McMeen
|
bf5dd7b969
|
docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e
am: 8386df9ea1
* commit '8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
docs: Update to column widths for Complications table
Change-Id: Iacc8d86b622f2ecf46625fdf9d12b31dca78655e
|
2016-05-19 22:56:34 +00:00 |
|
John Reck
|
7298186769
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c
am: 08a4808197
* commit '08a480819763dd632fd8006a0ea57b8220ee121a':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e
|
2016-05-19 22:54:05 +00:00 |
|
Android Build Merger (Role)
|
e6db0f314f
|
Merge "Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813 am: cd44b983fe" into nyc-mr1-dev-plus-aosp
|
2016-05-19 22:51:38 +00:00 |
|
Abhijith Shastry
|
0980dc26b1
|
Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813
am: cd44b983fe
* commit 'cd44b983fed7431ab930852ddd3a22c0d3b19a90':
Update BlockedNumberContract javadocs.
Change-Id: I93d004752ea4bdcd1c9c5aeb7fa25ddfdad0aad2
|
2016-05-19 22:51:07 +00:00 |
|
John Reck
|
08a4808197
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8
am: 0f59d9b80c
* commit '0f59d9b80c9f5daa321b683525ba8732add007c2':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6
|
2016-05-19 22:50:55 +00:00 |
|
Bert McMeen
|
8386df9ea1
|
docs: Update to column widths for Complications table am: 76372f02fe
am: 4cdad3212e
* commit '4cdad3212e67fabbfe4ba68f7b214be5ff5c10af':
docs: Update to column widths for Complications table
Change-Id: I22f82c2ca729b9d679fc077dbc9b54c85a70d6fc
|
2016-05-19 22:50:53 +00:00 |
|
Abhijith Shastry
|
4ced2b0732
|
Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813
am: 99d1fd935e
* commit '99d1fd935e7d8c8f3b27c41d1a7ebe7ffa0dbe63':
Update BlockedNumberContract javadocs.
Change-Id: I7bf4ac0a54b69fb2c4084eeac3de2f7de94b102a
|
2016-05-19 22:50:34 +00:00 |
|
John Reck
|
0f59d9b80c
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours
am: a7895725f8
* commit 'a7895725f8858465a404cbe4f6d5091e39423529':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63
|
2016-05-19 22:47:05 +00:00 |
|
Abhijith Shastry
|
99d1fd935e
|
Merge "Update BlockedNumberContract javadocs." into nyc-dev
am: 07abc7f813
* commit '07abc7f8139e012f8a92d74448db357446ab4664':
Update BlockedNumberContract javadocs.
Change-Id: Id8d90f28d56223ab1d01be634e83df2ee4dd9e93
|
2016-05-19 22:46:57 +00:00 |
|
Abhijith Shastry
|
cd44b983fe
|
Merge "Update BlockedNumberContract javadocs." into nyc-dev
am: 07abc7f813
* commit '07abc7f8139e012f8a92d74448db357446ab4664':
Update BlockedNumberContract javadocs.
Change-Id: I88cd7749894dc531fb793e800528af7a686076f5
|
2016-05-19 22:46:55 +00:00 |
|
Bert McMeen
|
4cdad3212e
|
docs: Update to column widths for Complications table
am: 76372f02fe
* commit '76372f02fe149aefccea502bf1ac0dca2693e84b':
docs: Update to column widths for Complications table
Change-Id: I67578fd73f26af6ef2187e4e9823fb71e89f990e
|
2016-05-19 22:44:13 +00:00 |
|
John Reck
|
a7895725f8
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2
am: 8238207ce6 -s ours
* commit '8238207ce6268422bcdb50d44f03e6a220081294':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58
|
2016-05-19 22:43:14 +00:00 |
|
Abhijith Shastry
|
07abc7f813
|
Merge "Update BlockedNumberContract javadocs." into nyc-dev
|
2016-05-19 22:43:12 +00:00 |
|
John Reck
|
8238207ce6
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d
am: 1da8c9baa2
* commit '1da8c9baa2d2da49e14224d34995337c4709b1ad':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381
|
2016-05-19 22:37:04 +00:00 |
|
Hemal Patel
|
b40e1aa065
|
Docs: Fixed a typo
Bug: 27583289
Change-Id: Ice0208182d98bb9e55343a915907c2b86a0bba65
|
2016-05-19 15:36:09 -07:00 |
|
John Reck
|
1da8c9baa2
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours
am: 1fae3b370d
* commit '1fae3b370dfd9536da166ef561df630cdff02b83':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3
|
2016-05-19 22:32:47 +00:00 |
|
Android Build Merger (Role)
|
926d525db9
|
Merge "Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev am: 75445fd6a0 am: 41f6d98d61" into nyc-mr1-dev-plus-aosp
|
2016-05-19 22:30:17 +00:00 |
|
Android Build Merger (Role)
|
5ad1a5dcd3
|
Merge "Merge "Update documentation about copyTo and copyFrom." into nyc-dev am: 1a523b7502 am: 34abcb758b" into nyc-mr1-dev-plus-aosp
|
2016-05-19 22:30:06 +00:00 |
|
Chih-Hung Hsieh
|
6c89616c38
|
Fix misc-macro-parentheses warnings in services jni.
Bug: 28705665
Change-Id: Iaf965875b667e45e1557e447de7988f729adfd52
|
2016-05-19 15:29:38 -07:00 |
|
Miao Wang
|
79be1401f4
|
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev am: 75445fd6a0
am: 41f6d98d61
* commit '41f6d98d6181f902ffa75b932ae6ecc1976f2910':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: Ib6fb3c9ef54367038f37cff9a404e166816df7ab
|
2016-05-19 22:29:38 +00:00 |
|
Miao Wang
|
03ca2f9ac4
|
Merge "Update documentation about copyTo and copyFrom." into nyc-dev am: 1a523b7502
am: 34abcb758b
* commit '34abcb758b40addd434bd8f402f885ef8280b8c1':
Update documentation about copyTo and copyFrom.
Change-Id: I47b73fdfe20ab616fb1945c49f2e32c2691a8f7f
|
2016-05-19 22:29:33 +00:00 |
|
Miao Wang
|
25df361013
|
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev am: 75445fd6a0
am: 35927794fc
* commit '35927794fc50683970d3cb01199de1324265ffa0':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: I1f253121da46b338ac502ea7f1f9b0225a6d2965
|
2016-05-19 22:29:08 +00:00 |
|
Miao Wang
|
bc1a2a6d85
|
Merge "Update documentation about copyTo and copyFrom." into nyc-dev am: 1a523b7502
am: 7ae30e18a4
* commit '7ae30e18a4065d62b42b407344999856ab82a038':
Update documentation about copyTo and copyFrom.
Change-Id: I439ff929a73cce4098a2ddb33c20be676fe959f9
|
2016-05-19 22:29:06 +00:00 |
|
John Reck
|
1fae3b370d
|
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours
am: bfa719f448 -s ours
* commit 'bfa719f448ab4d90368a3cdc556e515253528e17':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed
|
2016-05-19 22:28:23 +00:00 |
|
Chih-Hung Hsieh
|
cef190de85
|
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Bug: 28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
|
2016-05-19 15:25:50 -07:00 |
|
Miao Wang
|
41f6d98d61
|
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev
am: 75445fd6a0
* commit '75445fd6a043a892bb7d7f18c1d62c5f72337413':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: I052720b2df509ad33ab107e8aae3b38e2499e72c
|
2016-05-19 22:24:36 +00:00 |
|
Miao Wang
|
34abcb758b
|
Merge "Update documentation about copyTo and copyFrom." into nyc-dev
am: 1a523b7502
* commit '1a523b7502135a5cc0a94ea380263638b0ffdab1':
Update documentation about copyTo and copyFrom.
Change-Id: I7dab75f163e4dc3826cf864fbe61546fae6a3f7a
|
2016-05-19 22:24:31 +00:00 |
|
Miao Wang
|
35927794fc
|
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev
am: 75445fd6a0
* commit '75445fd6a043a892bb7d7f18c1d62c5f72337413':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: I8ccd115fd6f92ef4b4ef7194a77fd01ffbda5916
|
2016-05-19 22:24:27 +00:00 |
|