| commit | 361798d6c143ecfbcf6a948b2c0db172cbfc6b79 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Sep 23 17:36:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 17:36:41 2014 +0000 |
| tree | 48f02792804e6e90f5d5d982f166eb9ba7f16830 | |
| parent | 155a487b20fffff4fc7c1b90204946d927abc827 [diff] | |
| parent | 157bd0e39d0a27a27c290182b2bae7b524f341bb [diff] |
am aaaa0cf6: am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev * commit 'aaaa0cf6a1106aec82f99da5fcae6d584f9dfda6': @hide ConnectionService APIs.