diff options
| author | maxbogue <maxbogue@chromium.org> | 2015-08-27 16:45:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 23:46:07 +0000 |
| commit | fb3312def105321cc360b6c371789cf9e8fc3753 (patch) | |
| tree | 468fce208adf91767c789c16d037ff6ff1d0c8b9 /sync | |
| parent | 4559b5735d3e3c5adeb9f46fe3af5ab267c62edd (diff) | |
| download | chromium_src-fb3312def105321cc360b6c371789cf9e8fc3753.zip chromium_src-fb3312def105321cc360b6c371789cf9e8fc3753.tar.gz chromium_src-fb3312def105321cc360b6c371789cf9e8fc3753.tar.bz2 | |
[Sync] Move PassphraseType to org.chromium.sync, take 2.
There's no reason for it to be off in its own confusing package.
The original change broke the build due to a sneaky
conflict with http://crrev.com/1320733002.
BUG=488563
Committed: https://crrev.com/071fc8cd4c4dca88aa1b0c29528f3c733f25d474
Cr-Commit-Position: refs/heads/master@{#345997}
patch from issue 1321483004 at patchset 1 (http://crrev.com/1321483004#ps1)
Review URL: https://codereview.chromium.org/1314953007
Cr-Commit-Position: refs/heads/master@{#346028}
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/android/java/src/org/chromium/sync/PassphraseType.java (renamed from sync/android/java/src/org/chromium/sync/internal_api/pub/PassphraseType.java) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/android/java/src/org/chromium/sync/internal_api/pub/PassphraseType.java b/sync/android/java/src/org/chromium/sync/PassphraseType.java index 4802881..8ef3d5a 100644 --- a/sync/android/java/src/org/chromium/sync/internal_api/pub/PassphraseType.java +++ b/sync/android/java/src/org/chromium/sync/PassphraseType.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.sync.internal_api.pub; +package org.chromium.sync; import android.os.Parcel; import android.os.Parcelable; |