Commit 2e8d73ba 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

* commit '08c4578d':
  Clean up JniConstants

Change-Id: I6f60f575366a74bc19c78f9770b724473479bbd0
parents bd661dd7 08c4578d
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