tree 85f685ac322928fd75671f6188e7b97fe878819d
parent 6030ef4f2cf3cb0b0a650bfdf1ffb5487f20dc5c
parent 7e2364cb35f125899a551a1c2d7564320723436f
author Nick Kralevich <nnk@google.com> 1361401105 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1361401105 +0000

Merge "port 0a682b1855fb8c63a8fb502d60b37259dc893302 to art" into dalvik-dev