| commit | 6159baead8bc12ddaa0a9cb0d4885c7ce8e5155f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 16 14:14:24 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 16 14:14:24 2011 -0700 |
| tree | 5c58effcb7fcfdef39445897f68d630d6245897f | |
| parent | 73d2d1ff21f638eec634ea5a37f98c964b371467 [diff] | |
| parent | 4c60b30542a674d6375d2cccbe90161b34e62e5a [diff] |
am 4c60b305: (-s ours) am 70a89584: Merge 742968bd * commit '4c60b30542a674d6375d2cccbe90161b34e62e5a': Adding a cleanspec to pick up version change. Do not merge.