tree 674da8547698b6c90d81765f8f1a4b27328baff0
parent 28a02bd7998931bfe06f278761c71d8cf402a224
parent 529781dad1d4bc5685fd9ebbf04c1369246c2403
author Ian Rogers <irogers@google.com> 1343149428 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1343149429 -0700

Merge "Avoid cases of deriving information from unresolved types giving conflict." into dalvik-dev