| commit | 157bd0e39d0a27a27c290182b2bae7b524f341bb | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Sep 23 17:25:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 17:25:07 2014 +0000 |
| tree | 59b31a497f66a74be2ef6afc130c1d9df27b1987 | |
| parent | 8d843cea30321895364343575002442b2fd095a4 [diff] | |
| parent | 79355e03041aa67f56445844474d1e4875eb4328 [diff] |
am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev * commit 'fa5456e5455d215fa73a504d78a8f152d8cd1b05': @hide ConnectionService APIs.