tree f106f7e0ac6d75199f07dfe9f1d22b5401fadc6a
parent af15bf805176ee566877b297a4380b99c15da715
parent ef74eb94659d155844339562f7378b7c3cc51dd7
author Christine Chen <christinech@google.com> 1382035861 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382035861 -0700

am c7373e1f: Merge "Removes private resources from InCallUi" into klp-dev

* commit 'c7373e1f3081bf5b291980009a2fe0bbc67b8d89':
  Removes private resources from InCallUi