OSDN Git Service

Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1...
authorMarco Nelissen <marcone@google.com>
Mon, 1 Aug 2016 21:19:54 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 21:19:54 +0000 (21:19 +0000)
am: 559b777d4f  -s ours

Change-Id: Ibb838a504e61b142c33cbf6a9ed6e27d478dcbd2


Trivial merge