am 6fad34b5: Merge "Update UI for Caller ID by Google is enabled badge." into lmp-dev

* commit '6fad34b5fd3edfe8a14c038a72195b69afd503ba':
  Update UI for Caller ID by Google is enabled badge.
tree: 50d81405c111a98b890c329dee212f9ea86fc7f7
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags