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

Skip to content
Commit 4e6982ae authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0. 

Conflicts:
	src/com/android/dialer/calllog/CallLogActivity.java
	src/com/android/dialer/calllog/CallLogQueryHandler.java

Change-Id: Ie2412263b35b8607299dba39cb08f7a22069e362
parents e05bd75d b4341922
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment