| commit | 55b306c9e0ea29a10dfd79d5478344fcc98ca184 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Thu Apr 18 09:28:10 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 18 09:28:10 2013 -0700 |
| tree | 72409e8784d81f9449e8ec0eb562d2bc810d2d78 | |
| parent | a5d2da82a6a4486a4ef74e51ddd1c875f4c2d935 [diff] | |
| parent | 64eda4f4fa30fc60daeb5a8af462e688d4573700 [diff] |
am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit '64eda4f4fa30fc60daeb5a8af462e688d4573700': Fix an infinite loop