tree 152180658b81d98d83d4012da2c654ab4b69d31a
parent 992148484a286dab886dd4d1b58dabacf1c1920f
parent 0e86f9f105521095e081c9628d9ddb777c83f42c
author Flanker <i@flanker017.me> 1443509520 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443509520 +0000

am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel

* commit '0e86f9f105521095e081c9628d9ddb777c83f42c':
  DO NOT MERGE stagefright: fix AMessage::FromParcel