commit | d5a1074c4ec8142c2ed206c9fb515dd42139ef3a | [log] [tgz] |
---|---|---|
author | Irfan Sheriff <isheriff@google.com> | Wed Aug 29 10:58:30 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 29 10:58:30 2012 -0700 |
tree | b221f25766b8b2ec8e24b1f7d4ef4e171330e912 | |
parent | 2c577f1777a9227c581d41d5c08d674740e39ea9 [diff] | |
parent | c5f34bd40bc68925c6e99da02e179227d8eb3ae4 [diff] |
am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery" * commit 'c5f34bd40bc68925c6e99da02e179227d8eb3ae4': Fix join scenario with provision discovery