| commit | 74a052de631f999c498489e8b865a2dcd6223cef | [log] [tgz] |
|---|---|---|
| author | Daniel Lehmann <lehmannd@google.com> | Thu Aug 23 16:16:30 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 23 16:16:30 2012 -0700 |
| tree | 71cc3509d9f717b8c87e8c3441b7be565246a361 | |
| parent | a4e88c594cb6cd2b8a7aa878497f374145cff2e1 [diff] | |
| parent | e813f5e56ddc6395c5e08e9245e2c5ad41e91724 [diff] |
Merge "Guard JOIN in case the state machine gets into an erroneous state" into jb-mr1-dev