tree 50b9b74ea3f1cea6b533736783fbc6119a48b741
parent b77f116a2b0489178cc4803952027ce9eb5289ad
parent 7bdfc9700b1cad043c04c757f134db1bf3df00da
author Winson Chung <winsonc@google.com> 1337796822 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337796822 -0700

Merge "Fix a couple small bugs (issue 6539339)" into jb-dev