Commit c3c19ff9 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev 

am: fe20752d  -s ours

* commit 'fe20752d':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: I4f13693aa4f7f34fef848ee3e83b445196f05ecb
parents 8e420077 fe20752d
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