tree d41c461f11a6e75ee1893a159272ffb70e252e7f
parent aa762fe078d10e5024968686f3265440a4d88c38
parent a59d1793b89d0fd62c7544c94da4b6e5dac95ad5
author Elliott Hughes <enh@google.com> 1315191914 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315191914 -0700

Merge "Work around two problems." into dalvik-dev