| commit | e1fa6ec52faa220add0a244d9e221971d28ec498 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Wed Feb 15 07:53:55 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 15 07:53:55 2012 -0800 |
| tree | 857bfd96d31144082314afb2794ad58293c51650 | |
| parent | 038085598ca6180688767f90a759a5eda30e2daa [diff] | |
| parent | 18b4f7798becb81e75359dae466e0c9876ff6861 [diff] |
am 18b4f779: (-s ours) am f1a22399: am 2a5bc113: DO NOT MERGE * commit '18b4f7798becb81e75359dae466e0c9876ff6861': DO NOT MERGE