Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5d52ae9 authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Fix CRLF" into nyc-dev 

am: 0f5e32d8

* commit '0f5e32d8':
  Fix CRLF

Change-Id: I86907fbb586f3f01c0b42d301ec533557c0b0cfd
parents 330ebec6 0f5e32d8

tests/LocationTracker/src/com/android/locationtracker/SettingsActivity.java

+35 −35

File changed.

Contains only whitespace changes.

tests/LocationTracker/src/com/android/locationtracker/data/TrackerListHelper.java

+75 −75

File changed.

Contains only whitespace changes.

docs/docs-redirect-index.html

+8 −8

File changed.

Contains only whitespace changes.

docs/docs-redirect.html

+8 −8

File changed.

Contains only whitespace changes.

docs/docs-samples-redirect.html

+8 −8

File changed.

Contains only whitespace changes.

docs/html/guide/topics/resources/localization.jd

+484 −484

File changed.

Contains only whitespace changes.

docs/overview-ext.html

+8 −8

File changed.

Contains only whitespace changes.

location/java/android/location/INetInitiatedListener.aidl

+26 −26

File changed.

Contains only whitespace changes.