tree 5b724a271309018f02cffb58187b15395ccc263a
parent 40d5b6ee8fcdfe6cd115101952e0a99b1ab7a71a
parent 64baab3b2f8a1302283f1061764b0e9a862ceba1
author Brian Muramatsu <btmura@google.com> 1336612912 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336612912 -0700

Merge "Fix AssetFileDescriptorTest#testMiscMethod" into jb-dev