Merge "Add TimeStamp Constructor for HAL 1.4 Support"

author Nathan Harold <nharold@google.com>

Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)
author Nathan Harold <nharold@google.com>
Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)
diff --cc telephony/java/android/telephony/CellInfo.java
Simple merge
author	Nathan Harold <nharold@google.com>
	Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)