| commit | 4b8d56f381eac43fb8f62f1492054066e649dc04 | [log] [tgz] |
|---|---|---|
| author | Andy McFadden <fadden@android.com> | Tue Aug 02 07:49:32 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 02 07:49:32 2011 -0700 |
| tree | 600cbcc1d8d6076a06c3fbbbdd384d33cc6c0ada | |
| parent | 540e1ab5f55373b7c9e7019110932b9de7107e05 [diff] | |
| parent | 84ee8a53e429f6d1db2a6bdc856406b72a2620df [diff] |
am 84ee8a53: (-s ours) am 7513477e: (-s ours) am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data * commit '84ee8a53e429f6d1db2a6bdc856406b72a2620df': DO NOT MERGE - Avoid re-use of orphaned data