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

Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into... 

Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev
am: a76a5016  -s ours

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

Change-Id: Ic8d4909ac23b5cda9d940a2e346fdcee6f11ad1c
parents 420e3be1 a76a5016
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