| commit | 038ea6dcd4c32c21a093b8ec3780b435b5af51b6 | [log] [tgz] |
|---|---|---|
| author | Travis Geiselbrecht <travisg@google.com> | Thu Apr 12 13:55:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 12 13:55:58 2012 -0700 |
| tree | 68028e7a45fa0e24f35c4813b9d837ab80a16ec3 | |
| parent | 96f2b555d2200fca7d8399c4c9a968590637aa31 [diff] | |
| parent | e22bec1a7e61fd1d0355587305c3233e5a44508b [diff] |
am e22bec1a: (-s ours) DO NOT MERGE * commit 'e22bec1a7e61fd1d0355587305c3233e5a44508b': DO NOT MERGE