tree b0903b52cfd6a5b7e2da60cfea3b3f5739c61d60
parent 2168c076780bf43168bee3049fa1fd6b6459b0a5
parent 2e8ba1c14793563701449c4ddf58b77ac3c36ea8
author Michael Jurka <mikejurka@google.com> 1305326748 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305326748 -0700

am 2e8ba1c1: am 8ff6cb60: DO NOT MERGE

* commit '2e8ba1c14793563701449c4ddf58b77ac3c36ea8':
  DO NOT MERGE