OSDN Git Service

am a6b75013: am 3aea94ff: Merge "Rename Connection time APIs for Conference.java...
authorSantos Cordon <santoscordon@google.com>
Tue, 12 May 2015 20:44:22 +0000 (20:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 May 2015 20:44:22 +0000 (20:44 +0000)
commit491b1c254db2de764e1c6f29b18f8241e17fe948
tree91c198ee1a8e63136b2d8e4b312827a428dae648
parent06cda101112d7f5a6fb1adbcd9b1c56dcae77a58
parenta6b75013d4af6ec59c30f792e14ddc2986ff0b89
am a6b75013: am 3aea94ff: Merge "Rename Connection time APIs for Conference.java" into mnc-dev

* commit 'a6b75013d4af6ec59c30f792e14ddc2986ff0b89':
  Rename Connection time APIs for Conference.java