| commit | 4fb820e950ec8a542af6f2e4ac9faee790a9b315 | [log] [tgz] |
|---|---|---|
| author | Owen Lin <owenlin@google.com> | Mon Sep 26 13:56:01 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 26 13:56:01 2011 -0700 |
| tree | bf630d40cdfc149d96c8e62a8ded235e54fa0cfb | |
| parent | ca07852ce136f83cc1badac7d8c0ce234570bca2 [diff] | |
| parent | 1ef98e32ccc4c6f3f69f812c1a92294065d80271 [diff] |
am 9025dba3: (-s ours) (DO NOT MERGE) * commit '9025dba35881391c24bdaa88d1ec84d15d722f65': (DO NOT MERGE)