| commit | a65891347556b4d14f6dad829017513b984d20c1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 15:30:36 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 12 15:30:36 2012 -0700 |
| tree | 360059b5f367b7b870e466f1f6b758723963bae0 | |
| parent | 45e869874aaf90091be2f2fac5fcf9c73c36baee [diff] | |
| parent | 89d702ac6864e0111ea2f16a524c71804bae5a5c [diff] |
Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp