tree dc5ebaef50ff1b14bc9f8f9408cf76efee1a7e88
parent 300628267750a5152154600c279c9a4f3951fdfa
parent 65f9ad6be68dfe57022b36862c90ef1d68780048
author Brian Attwell <brianattwell@google.com> 1410500227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410500227 +0000

am 65f9ad6b: am fba800e6: Merge "Dialer\'s fab in EmergencyDialer" into lmp-dev

* commit '65f9ad6be68dfe57022b36862c90ef1d68780048':
  Dialer's fab in EmergencyDialer