| commit | 39b58ba2b299e1c97e13535aae9add530d942c7b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue May 01 09:53:48 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue May 01 09:54:38 2012 -0700 |
| tree | 94247b9025407767a527abeded5c8cfebfabe1cb | |
| parent | a43d2589b1ce657d8af7702cd7b3e3114e7ae133 [diff] | |
| parent | bc2fb7b92e013779356c16685a388d5cdae6e93d [diff] |
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2