* commit 'c4e7b92fefce5b069f50659363c8878612303510':
  Make the tag field public.

Change-Id: Ibfda5bb1ac3150ea90d82a152730be76a2f8bf71

* commit 'ddf016d828d928eefbce89c602c323bf0f998574':
  Add MessageNano.messageNanoEquals().

Allows two messages to be compared directly for equality without
generating an equals method for every generated message.

(Ports CL58125010)

Change-Id: I92ab5088539d1fd722fee7b5e28a8c825926c3b6

* commit '0068978c364173b15a9cb8ab65fb2d2eac17f136':
  Fixed octal printing of bytearrays

* commit '77866143340f7541180d91fa316071ce947b3a8d':
  Revert "Fixed octal printing of bytearrays"

* commit '238e0ac56654afadb5270264660db7305f139c02':
  Fixed octal printing of bytearrays

 - Now with 50% less '&' and 100% fewer build breakages!

Change-Id: Icf0283220f75cd14b8564b51bd55973e5b7da56b

This reverts commit 8b8481868877c9db407d04bdf4843e50d8920806.

Change-Id: I0876235b79cd7745312879d0f1b00c6d1c1a1b7a

Change-Id: Ia848d7fae9aeab89e65b00f05cee6c1e6d649d94

* commit 'c6d612ac7b18ba758c9067136c1217589aa5796f':

* commit 'b172d66772c921589a1338f00b34ff5bc3bcc225':

am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit 'e9d25570a8f67156a77260176b4a7a6f008e156c':

am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit 'b088989c421c7d7379632ffb4f1fdc221ed9d2c9':

am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit 'b38ef83f969221c2cbb891e609bb80f7a53a034d':

* commit '8add9962a5c88ff307d573be91bb091a2b14568d':

am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '1944e19cb1dc82a52d46a42fe8a0ed4037602565':

am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '7f3f30e96965e7189430e4acc53520275627264c':

am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '7bf587289933768ada48e79cf43deecfad65c576':

am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit 'ee16014efd4d8a9aff0fd6efc40782ce250a1cd8':

am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '2b4699938126550d4e6ba7a3e0f70672c2625c20':

am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit 'dc94687566ba7d98f65e4769d9c0e7d2f20ce895':

* commit '9160bc69c92253ddcdbe30a6737adc2bcc515c66':

* commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126':
  Fix access around unknownFieldData.

* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
  Keep pointers to extension values.

* commit 'cca3823db855ecbcad350332a274f253be7e9662':

am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':

am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit '1f8913765270e9d90ad7384156629e116236355d':

* commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':

am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit 'a3ab4364c6bb266e8b5021913b22433d8401ec46':

am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':

am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '3656cc20c8a569964d0450ce3207b651c007c35c':

am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':

am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '61317c325de4a7736ea88e72ff4be4193583e1c3':

am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':