| commit | 184e4b79f2851fb671b4e55bf3dfadb7733104b6 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Sat Nov 22 07:05:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 22 07:05:39 2014 +0000 |
| tree | 49a1f229b11d1e8ff992a83ea8598611316cb2a2 | |
| parent | 7d96fa8be6197d30f3d2f4fc6eb4e2286eb20cc7 [diff] | |
| parent | 5c183bdf46f11a2dd6e45aa81a8b5d6133cb8bc3 [diff] |
am 5c183bdf: am cd00b57f: Merge "Avoid some recursive aborting." * commit '5c183bdf46f11a2dd6e45aa81a8b5d6133cb8bc3': Avoid some recursive aborting.