tree aff8975073de4d008a513466f6d53385a0189e89
parent 15e74b9da8b4cda11ee54da1e77a02d1a86c944a
parent e9b06d754af03faf27012fbed1e7559ec1ba7c79
author Android (Google) Code Review <android-gerrit@google.com> 1242710785 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1242710785 -0700

Merge change 1579 into donut

* changes:
  Teleca 2b changes