tree eb9c704a778960b4be355089cef1534c9754013e
parent 59dc8dbf566e6900c81feec1756014d2a2fd0843
parent 105015e3b07650638e696dcf4cdeb8f4d1b14de4
author Nancy Chen <nancychen@google.com> 1409005453 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409005453 +0000

Merge "API Review PhoneManager -> TelecommManager. Rename methods (1/6)" into lmp-dev