OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 075bcf7 44907aa)
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
authorRyan Mitchell <rtmitchell@google.com>
Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)
* changes:
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628 am: c3aa2a4d3f am: 648a950ce9
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628 am: c3aa2a4d3f
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0
  Fix DynamicRefTable::load security bug

1  2 
libs/androidfw/ResourceTypes.cpp patch | diff1 | diff2 | blob | history

diff --cc libs/androidfw/ResourceTypes.cpp
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help