| commit | 9979ca5833df9c7978dc7089b0ce3898ff17705b | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu May 19 10:52:43 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 19 10:52:43 2011 -0700 |
| tree | a682011d320462a7c841ea4260b587dd21a01d57 | |
| parent | 02aad4811a3390d4a5f509cda41dc421a0f24447 [diff] | |
| parent | 893ace604d374f6aa80ad18642fe266bad0a3940 [diff] |
Merge "resolved conflicts for merge of c1730dcf to master"