| commit | 1a3708ec0fa2c05b1858ef0a87fae2e851307661 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Tue Oct 22 02:50:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 22 02:50:22 2013 -0700 |
| tree | 23c9090477bad8f58733a9434d799c8f8cf28ad9 | |
| parent | 9fdc19ea9c6e5cd6e2af83e5a96078377e9ada78 [diff] | |
| parent | 9ba343d7348301fc02c2eb2cd0f7d16081e417e2 [diff] |
am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE * commit '9ba343d7348301fc02c2eb2cd0f7d16081e417e2': DO NOT MERGE