| commit | c51138fb3c412dfe5dc5de03338e26c1568a6790 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Thu Sep 25 16:29:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 25 16:29:41 2014 +0000 |
| tree | f81fad7f358fa625b862bc48bb9228f8dc1cc587 | |
| parent | 4656e6bb168a9045f9e6137f3e1c7876f9bf2dea [diff] | |
| parent | 3c64f6c0be500fbea525e68f98569b46955e2cb3 [diff] |
am 22e0e6fc: am 11316e1c: am 8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev * commit '22e0e6fcc74796986afe5a6469ee080d00dfeb04': Revert "@hide ConnectionService APIs."