tree 23c9090477bad8f58733a9434d799c8f8cf28ad9
parent 9fdc19ea9c6e5cd6e2af83e5a96078377e9ada78
parent 9ba343d7348301fc02c2eb2cd0f7d16081e417e2
author Winson Chung <winsonc@google.com> 1382435422 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382435422 -0700

am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE

* commit '9ba343d7348301fc02c2eb2cd0f7d16081e417e2':
  DO NOT MERGE