| commit | e1891b79455842a794c17c93ce3a4a066076c802 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Sep 26 13:24:33 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 26 13:24:33 2011 -0700 |
| tree | 501ab37bae2f3525a9bffd1187075690a3d1fdc7 | |
| parent | 57a4eaf4bae1e298d2d0beab69b545aadbc06513 [diff] | |
| parent | becc3da91507193ef4270d65e2756bb0a00c15a9 [diff] |
Merge "resolved conflicts for merge of 2f2882a0 to master"