OSDN Git Service

am 1a844448: (-s ours) am 933fd689: am ec58a72b: am bf03b948: am 75143f30: am 03b7f72...
authorWei Jia <wjia@google.com>
Fri, 4 Sep 2015 17:55:45 +0000 (17:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Sep 2015 17:55:45 +0000 (17:55 +0000)
commit416001ade18568a682e4ab44dae03c271cfb6127
tree76fe806d031a362223877e0a19edef2cd02f2872
parent5cb3dc50ab663efd855b9dfc05b25c1a2250d9e8
parent1a8444481c32422ea46e2a2062d9d49fc11eeeef
am 1a844448: (-s ours) am 933fd689: am ec58a72b: am bf03b948: am 75143f30: am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp

* commit '1a8444481c32422ea46e2a2062d9d49fc11eeeef':
  DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp