OSDN Git Service

Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e...
authorChong Zhang <chz@google.com>
Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)
am: 0b542a3789

Change-Id: Ice81acc494ab5405f281f6132c39a7b64fe3e94d


Trivial merge