| commit | f9430aba1adb8eb80dfd316748e92ebf62393469 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu Aug 04 09:46:09 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 04 09:46:09 2011 -0700 |
| tree | 9ef7319a74f9d76da4149c2f223a824adae5e452 | |
| parent | adc25267f8ba29ccf1408d8840dc9e840e7c65c7 [diff] | |
| parent | 2b15cb21b313f83f7cccdc6f9116ba31ddc190ad [diff] |
Merge "Resolve merge conflict for '75f1fdec':"