tree d5eca56524292b41940347ddbe5387fbf136c141
parent 1131392281cebcf958bbf5981203b1a34eef6ba2
parent 156f418aa83f50cd6f37546226228f6a8fd2a1dd
author Android (Google) Code Review <android-gerrit@google.com> 1242965579 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1242965579 -0700

Merge change 2299 into donut

* changes:
  fix build breakage