| commit | 84ee8a53e429f6d1db2a6bdc856406b72a2620df | [log] [tgz] |
|---|---|---|
| author | Andy McFadden <fadden@android.com> | Tue Aug 02 07:48:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 02 07:48:21 2011 -0700 |
| tree | 64e226235ca82aa440afb7f4cfe56ae8b72663ba | |
| parent | 989d50bd95b45755adc09facdf53e4218cf10077 [diff] | |
| parent | 7513477e5e4afdc32f0cf5e19da08da84c5d9533 [diff] |
am 7513477e: (-s ours) am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data * commit '7513477e5e4afdc32f0cf5e19da08da84c5d9533': DO NOT MERGE - Avoid re-use of orphaned data