commit | 41b529d111bd2898b279aba7b384fda2b2939977 | [log] [tgz] |
---|---|---|
author | Flanker <i@flanker017.me> | Tue Sep 29 08:24:09 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 08:24:09 2015 +0000 |
tree | 6ca64a45672cd1001f4ebec16cab068391541be8 | |
parent | 05104e553ec217036fe180101704d6e5686cf346 [diff] | |
parent | 66cd93d4b9dbf7e27f4421981c87e44e7fc582da [diff] |
am 66cd93d4: (-s ours) am 02d60280: am 4bd8f46c: am 73b61dd2: am 12a68607: (-s ours) am 4189eb41: am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel * commit '66cd93d4b9dbf7e27f4421981c87e44e7fc582da': DO NOT MERGE stagefright: fix AMessage::FromParcel