tree 57703a16ef7f699f430cba07730b4f8eb17628ef
parent 88f3e4efd49a0d39b01e37310ebaba2c4b40a040
parent d69ad65156cca8e42b5d94650139da0528235c66
author Ken Wakasa <kwakasa@google.com> 1366990162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366990162 -0700

am d69ad651: Merge "A small follow-up to I8d03bae3264974eff7b790e27c073b0a8758d17a"

* commit 'd69ad65156cca8e42b5d94650139da0528235c66':
  A small follow-up to I8d03bae3264974eff7b790e27c073b0a8758d17a