| commit | 51282faa8c429f63c03b4007d66371863e6e8c2d | [log] [tgz] |
|---|---|---|
| author | Oscar Montemayor <oam@google.com> | Mon Mar 29 16:19:49 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 29 16:19:49 2010 -0700 |
| tree | 4204a7b2a8ec601ff51f0713ef6bb0c12c1a5568 | |
| parent | dcc38b3c153dc859fc71a836ff70b52ef311fc22 [diff] | |
| parent | 2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d [diff] |
am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please refer to Bug#2502219 for more info. Merge commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d' into kraken * commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d': DO NOT MERGE