| commit | fc0b609a3ead8cb0b2e9452781b3a4670586d9c2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Apr 30 11:22:11 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Apr 30 11:22:11 2012 -0700 |
| tree | 521d58ea55abd88d2b6941f6f3180e8661162d23 | |
| parent | 438acfc43ab08daae92c39d0da0d345e72c20428 [diff] |
resolved conflicts for merge of ec8d4c9b to jb-dev-plus-aosp Change-Id: Iaeecf77e219563f365a7739692204ea84f617cfc