tree 08664922316fd1bc498892751b9ff363dd65fb46
parent 9cbc6a7542b9394242be71312c69011ad06fafea
parent a47f02afb1e1f2c4abd9379c13903a5dde89d354
author Android (Google) Code Review <android-gerrit@google.com> 1242948775 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1242948775 -0700

Merge change 2260

* changes:
  change 2115 wasn't merged properly into master. this fixes that.