| commit | bd751ce3af74ba1eb7c5a832bd98a7c3c7480598 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Dec 05 14:26:22 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 05 14:26:22 2011 -0800 |
| tree | fab25a32126e425c3140828152d659889406dbca | |
| parent | 9dfd7687ed1cefaa171c17863f273e9fe7e7f7e4 [diff] | |
| parent | f2ff9ec7f3b8939a24a051af5d713987094d2302 [diff] |
Merge "resolved conflicts for merge of 07bacabe to master"