Commit b7563450 authored by Victor Chang's avatar Victor Chang Committed by android-build-merger
Browse files

[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases... 

[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era
am: 714c3b39 -s ours
am skip reason: subject contains skip directive

Change-Id: Idbccf9719d5d0679c0ecc6f7290cdea30150df25
parents 781e06eb 714c3b39
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