tree 673307f1ea1fba45cd0a8205309ce9fb91f11538
parent 8cceb2e67e5c56e767cc7c08bec6f3bf8230f611
parent 6d269be7f35bea7724ff9bf62b679223e4ebe438
author Android (Google) Code Review <android-gerrit@google.com> 1247260798 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247260798 -0700

Merge change 6814

* changes:
  Change 107 and 146 from partner repo.