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