| commit | ecc0957193e971e8f94f39efdbb37b0e4ed4f988 | [log] [tgz] |
|---|---|---|
| author | Eric Erfanian <erfanian@google.com> | Mon Jun 19 23:20:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 19 23:20:49 2017 +0000 |
| tree | bf00ada449ee3de31ec983a14e84159200aa18c2 | |
| parent | 2f1c7586bcce334ca69022eb8dc6d8965ceb6a05 [diff] | |
| parent | 0a7b301e28d227400f21143a8027ab6580057d01 [diff] |
Update AOSP Dialer source from internal google3 repository at cl/159428781. am: ea7890cd5e am: 0a7b301e28 -s ours Change-Id: Ifc2aaaa33992aaad8d5fa4b16fe47a5862385131
diff --git a/Android.mk b/Android.mk index 48b12aa..dc34cc4 100644 --- a/Android.mk +++ b/Android.mk
@@ -530,4 +530,3 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) -
diff --git a/java/com/android/dialer/callintent/speed_dial_contact_type.proto b/java/com/android/dialer/callintent/speed_dial_contact_type.proto index bf34d09..2d1fa3f 100644 --- a/java/com/android/dialer/callintent/speed_dial_contact_type.proto +++ b/java/com/android/dialer/callintent/speed_dial_contact_type.proto
@@ -17,4 +17,3 @@ FREQUENT_CONTACT = 3; } } -
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto index 4b1e19b..1fa4727 100644 --- a/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto +++ b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto
@@ -41,4 +41,4 @@ } // LINT.ThenChange(//depot/google3/google/internal/communications/voicemailtranscription/v1/\ -// voicemail_transcription.proto) +// voicemail_transcription.proto) \ No newline at end of file