OSDN Git Service

Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev
authorLajos Molnar <lajos@google.com>
Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)
commit4773895ad67a50111a1e2c0942e1f1b5604e0f06
treea92af62bb2e3cdaf48c294b838b28dde14e54742
parent6810ac8bcdbcc5fbc30f33ccf5bbe77d3fc947b2
parent5e5bb2a861366a5c58db087d11cde68f5c65a4a0
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder