resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am:... (f1530bf3) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / evolution_frameworks_base

Commit f1530bf3 authored Dec 18, 2015 by Robert Greenwalt Committed by android-build-merger Dec 18, 2015

resolve merge conflicts of 9887f2f5 to lmp-sprout-dev. am: 5a776514 am:...

resolve merge conflicts of 9887f2f5 to lmp-sprout-dev. am: 5a776514 am: 5946a9b7 am: 2ecc918b am: 81674b1f am: 1e04dfb9
am: 3927089c

* commit '3927089c':
  Protect some new broadcasts.

parents a652b716 3927089c

Hide whitespace changes

Inline Side-by-side

Please register or to comment