| commit | 066d3f9b3bd77df71542b132adda8eb25bc013c0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 22 14:35:12 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Oct 22 14:35:12 2012 -0700 |
| tree | 2e8ce7e1095bed12313e765c380bdace619d3530 | |
| parent | a40f5e662db68b297ff20c9ed418c726e0c001a1 [diff] | |
| parent | 3e5e9e9ee2ee24072b7b87a3e4eda2df0639a469 [diff] |
resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp Change-Id: I621d0e984a266478b4297a25afd164c1275e30f9