Commit 18c8623f authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

resolve merge conflicts of 3db6f943 to nyc-dev-plus-aosp am: 08c4578d 

am: 2e8d73ba

* commit '2e8d73ba':
  Clean up JniConstants

Change-Id: I7cb5f55030007e962d1fa2bcf4e926155b730ade
parents d3992f15 2e8d73ba
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment