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

Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android... 

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

Change-Id: I2ee1e5bdf50df89c16b19e8e788439858bf505b9
parents 41703900 ad5f5263
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