Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / packages / services / Telecomm / 32569a90a2be0db56836fe81ae0bf775a2296849
commit32569a90a2be0db56836fe81ae0bf775a2296849[log] [tgz]
authorShreyas Narayan <shrena@codeaurora.org>Sun Mar 15 02:39:10 2015 +0530
committerShreyas Narayan <shrena@codeaurora.org>Sun Mar 15 02:39:10 2015 +0530
tree00ad5633053dbde274da4398cb7405ae4eb33d1b
parentccaedef7037d63569fc7f0c5f3f43807b939beb4 [diff]
parent001dabc2be35628e5cd26cf32e82e91d436f6aed [diff]
Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.01.00.066.050' into HEAD

AU_LINUX_ANDROID_LA.BF64.1.2.1.05.01.00.066.050 based on quic/aosp/LA.BF64.1.2.1

Conflicts:
	src/com/android/server/telecom/Call.java
	src/com/android/server/telecom/CallActivity.java
	src/com/android/server/telecom/CallAudioManager.java
	src/com/android/server/telecom/CallsManager.java
	src/com/android/server/telecom/InCallController.java
	src/com/android/server/telecom/PhoneAccountRegistrar.java

Change-Id: I1138bb070cb43b2441530a1cfcff4669ce101e8b
tree: 00ad5633053dbde274da4398cb7405ae4eb33d1b
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml
  9. CleanSpec.mk
  10. proguard.flags