tree c2175942e3a631ad112fe6ab17da560c45fc1ae2
parent 9c8b963189acf6eda28ec4726555fffaceb8db1b
parent e9821acc4e0e410e768fb910343092a0dfa0c71f
author Jay Shrauner <shrauner@google.com> 1400026056 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400026056 +0000

am e9821acc: (-s ours) am 3675f423: am 7ef7b4e6: (-s ours) am f0b1d8ac: (-s ours) am ae01ab1b: am c9063f5c: Make Dialer a core app DO NOT MERGE

* commit 'e9821acc4e0e410e768fb910343092a0dfa0c71f':