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

Merge change 6805

* changes:
  Changes 203 and 225 from partner repo.