| commit | efae3d24bd6cd5d2916a898148192ed395b3b7b5 | [log] [tgz] |
|---|---|---|
| author | Jason Simmons <jsimmons@google.com> | Wed Nov 09 10:57:19 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 09 10:57:19 2011 -0800 |
| tree | 65bd9bf01805dfb10099f19935f35108ef96d521 | |
| parent | 43adbae8037540bee8fa7001b33d7d4e6f1d5770 [diff] | |
| parent | f98168677929fe9e004d12645a5850551072395a [diff] |
Merge "resolved conflicts for merge of 3af8b88d to ics-aah" into ics-aah