| commit | d3668bd0b8424b88f3006e1d0680f8cb2bdc0a17 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Wed Feb 15 18:37:22 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 15 18:37:22 2012 -0800 |
| tree | 969d2b8e653baf7d62288a9ab96bf13705480d65 | |
| parent | 3a58b88901f6c504837dc47f01dace6d0bacaed0 [diff] | |
| parent | 299e97ed0e880c8edc04b3512e18bb7b33eac634 [diff] |
am 299e97ed: (-s ours) am fd5892ce: am 2a5bc113: DO NOT MERGE * commit '299e97ed0e880c8edc04b3512e18bb7b33eac634':