tree 31fd04714ca54e2eff176d1ac48011ff1b92d7c5
parent 1588b5afe0ec2debaf24235310573a1dcc0f1f91
parent f00fd5886b232d45134a236e22a14a4c4008d4df
author Chenbo Feng <fengc@google.com> 1500422374 +0000
committer android-build-merger <android-build-merger@google.com> 1500422374 +0000

Merge "Rename the native test file" into oc-dr1-dev
am: f00fd5886b

Change-Id: I10ce840ec4fb2aea62730cbcff189ecdea3e9ee9