| commit | 6e207824af267eea8777949ccf6d0584accd55a0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 13 07:42:04 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 13 07:42:04 2012 -0700 |
| tree | 15c43801d564c5210cd2c6b4b269d0ef75edadb4 | |
| parent | 06b1a47fe19699e8cb94fd6a007f82f3b41119fe [diff] | |
| parent | 572d0d7dd3ceaab12911f403689c01589602a3f4 [diff] |
resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb