| commit | 2909e5e671b786cce58b4f3ce65fdcdcd5e128dd | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Jun 16 16:38:07 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 16 16:38:07 2011 -0700 |
| tree | 02a86dc22485fd8ce11695a5684f670154c34610 | |
| parent | 3ebb0c39a62cf0cea840ae277d3e4efc04b4e97a [diff] | |
| parent | e4ab0a6661114807b50148afeaff3e5c4c667dd7 [diff] |
Merge "resolved conflicts for merge of 872a1e79 to master"