tree 7f6e7c20a99ad465b31f43c39b35e83cf7303915
parent e2c1d2c12c8d70f88c14a3593c2ebd202e15a6d3
parent 496a71cfd58fb10b621a6e1b3205929908bcd86d
author Amit Mahajan <amitmahajan@google.com> 1416852380 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416852380 +0000

am 496a71cf: Merge "Revert "Revert "STK Call Control feature implementation.""" into lmp-mr1-dev

* commit '496a71cfd58fb10b621a6e1b3205929908bcd86d':
  Revert "Revert "STK Call Control feature implementation.""