tree 1a65a7000810c7e096452c5b9e2cafdacd5be65f
parent 98ad09880b148d69f4202ad40872d1cdfc1e491e
parent 2bad713f31d642d5350949b90b3abe00fbd9ca55
author Android (Google) Code Review <android-gerrit@google.com> 1248962197 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248962197 -0700

am 2bad713f: Merge change 8860 into donut

Merge commit '2bad713f31d642d5350949b90b3abe00fbd9ca55'

* commit '2bad713f31d642d5350949b90b3abe00fbd9ca55':
  Fix bug 2017664