am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]

* commit 'ea2f4e3cbbf21531d00ba966ca5863bb575c0cf4':
  Integrate build_font.py [DO NOT MERGE]
am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit '1699a434a669a70e8696c5e110cacaf0725a68c0':
  Integrate build_font.py [DO NOT MERGE]
am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]

* commit '071a2f8363e32fd99da8c03e03dc8f7a9a5378c2':
  Integrate build_font.py [DO NOT MERGE]
am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit '1bb64302ad23e9edea50b09c673f59f681e4f47a':
  Integrate build_font.py [DO NOT MERGE]
am 8eaddc6c: am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]

* commit '8eaddc6cac7f10e434dcdd4efc119e363353e8a8':
  Integrate build_font.py [DO NOT MERGE]
am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity

* commit '60d43ddecf8f582348685f4bfc5cd980dca9a1ba':
  DO NOT MERGE revise butter bar message for clarity
am 307a8ec9: am 8eaddc6c: am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]

* commit '307a8ec96132dc3d6859a5e1cf338b0dc9c25273':
  Integrate build_font.py [DO NOT MERGE]
am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit '9915a60c5d1a003f45455930e2a55033d6e15f3f':
  Integrate build_font.py [DO NOT MERGE]
am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity

* commit '62cf72b03fe2888b2dd80442ad4ec9851ddc431c':
  DO NOT MERGE revise butter bar message for clarity
am 98da9070: am 307a8ec9: am 8eaddc6c: am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]

* commit '98da90707f1c5fdec61b75196d593b56ec6f4c79':
  Integrate build_font.py [DO NOT MERGE]
am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit 'a0130a4d6fea1b0b256c5a5ad11886f9291a4c0a':
  Integrate build_font.py [DO NOT MERGE]
am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit 'd23dcdf135541f2c4d7e61b1f02a04fe6b0bac48':
  Integrate build_font.py [DO NOT MERGE]
am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit 'da1119642d5a3eb4fd34459ef88d6e1cfbecd1da':
  Integrate build_font.py [DO NOT MERGE]
am 0b3aa00e: am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit '0b3aa00eaf7a836770681f69c096e915cd686dd9':
  Integrate build_font.py [DO NOT MERGE]
am 72146221: am 0b3aa00e: am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit '721462210a5713e9bc59ed292a8bbea9c433a1c1':
  Integrate build_font.py [DO NOT MERGE]
am f0200e87: am 72146221: am 0b3aa00e: am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]

* commit 'f0200e87547272a33e147f435fbae384ea82b359':
  Integrate build_font.py [DO NOT MERGE]
am a97f675c: am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."

* commit 'a97f675c921efdbc34f33f12c9a523fc898e624f':
  ADBS now uses stack_core code to parse traces.
Copy over aidl info for modules not loaded by the current build

That way we don't lose the record if user is running mm/mmm.

Change-Id: I1e1a8b99b4f659b73f73d89f409a24aa36464066
am bc7501e1: Merge "More consistent use of 64-bit build variable."

* commit 'bc7501e10324caf1318769901d8a382d46be0b60':
  More consistent use of 64-bit build variable.
am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"

* commit '02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
  Make dex2oat heap size product configurable [build]