| commit | 25f0eb884d66f7eb0d16953fe3f54f96df544e28 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Oct 04 22:19:41 2012 -0500 |
| committer | Jeff Hamilton <jham@android.com> | Thu Oct 04 22:19:41 2012 -0500 |
| tree | 5dd81f14724b29d6e356e746ed2b1601f1951f52 | |
| parent | 3960586f08fe6d3579586d4225f90bd00345254f [diff] | |
| parent | f12f744843a67c910ec325fc6dfa73988f67b97c [diff] |
Merge commit 'f12f744' into HEAD