| commit | f02e2693120f84b7d08f059dd9b30eacf838e405 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Thu Apr 18 09:32:04 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 18 09:32:04 2013 -0700 |
| tree | 8fd582f7c25149d429674c2453330475841b1b0c | |
| parent | 3a18ae70ccdce702478bcb7c7d238373b460b014 [diff] | |
| parent | 55b306c9e0ea29a10dfd79d5478344fcc98ca184 [diff] |
am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit '55b306c9e0ea29a10dfd79d5478344fcc98ca184': Fix an infinite loop