| commit | 8bb154c272dbd11922d74e882a538ea9af6cd7db | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 20 15:23:16 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 20 15:23:16 2012 -0700 |
| tree | bc5a1968a4c9e8c51b5ff361c0de540a9cf4b826 | |
| parent | ca7a9ef0e52216e88d302feacf8edb766d813f5f [diff] | |
| parent | acbbd1142db522b15d06d6a1e076463e5c55c8b3 [diff] |
Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev