AAP87
merge in master-release history after reset to master
AAP88
merge in master-release history after reset to master
AAP89
am 9b2ef223: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '9b2ef2237229ca1ce38df2d54550985ec5f7fdaf':
  JDP81B
am f6315729: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'f6315729088bb1ebbf5d8ab6e810dd3462973018':
  JDP82
am dd319cef: am 26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"

* commit 'dd319cef3f0e351f0b1621167b22eb39e86b27ad':
  Switch to GCC 4.7 for X86 and MIPS
merge in master-release history after reset to master
AAP92
merge in master-release history after reset to master
AAQ01
merge in master-release history after reset to master
AAQ02
add multiple key support to signapk

Support signing .apks (but not OTA packages) with multiple keys.

Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
Merge "add multiple key support to signapk"
am 57a5e52d: Merge "add multiple key support to signapk"

* commit '57a5e52d3692b5f7e4008c8e6aa591aee67de130':
  add multiple key support to signapk
am 2d867bd2: am 57a5e52d: Merge "add multiple key support to signapk"

* commit '2d867bd207014abc803199f8a76de84c90f9a4aa':
  add multiple key support to signapk
merge in master-release history after reset to master
AAQ03