| commit | 1aa82aea428360049fba8867177bba42273637b0 | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Tue Apr 09 16:18:05 2013 -0700 |
| committer | Robert Ly <robertly@google.com> | Tue Apr 09 16:18:30 2013 -0700 |
| tree | 6c2ab35186756b9af43304256a25011589603cfc | |
| parent | a143cf8521e2139bbd88c5f4ad3d5b3d85f2f8ca [diff] | |
| parent | 35f2fda6aaeaf733ab68a3b7f7ccc67f009c09a9 [diff] |
resolved conflicts for merge of 35f2fda6 to jb-mr1-dev-plus-aosp, preserving conflciting files(.md files should be deleted) for now to fix conflicts and to keep track of changes htat need to be migrated to .jd. Will resolve for real in another CL Change-Id: I0913254e89539b418ff9a52184dddcd524fca830