resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am:... (bd43d7e9) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / foxrecovery_bootable_recovery

Commit bd43d7e9 authored May 19, 2016 by Matt Sarett Committed by android-build-merger May 19, 2016

resolve merge conflicts of 86a28d0a to klp-modular-dev am: a5bc5962 am:...

resolve merge conflicts of 86a28d0a to klp-modular-dev am: a5bc5962 am: 36acff7d am: 1f814d76 am: ca45737e am: 8a1d4e97 am: aa02888e am: 300af077 am: fc1d9a49 am: b02b2fe3
am: 75dea9ca

* commit '75dea9ca':
  DO NOT MERGE Use updated libpng API

Change-Id: I75e0414350115ec133d9905263c01c3b385512b3

parents 027b403e 75dea9ca

Hide whitespace changes

Inline Side-by-side

Please register or to comment