| commit | 0275552bba7937c5cac07239336cddeb2b4a5bd2 | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Mon Jul 23 18:33:11 2012 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Mon Jul 23 18:33:11 2012 -0700 |
| tree | 828b89198e50f3d2841780f459e3f65fdc3e2a84 | |
| parent | abfbce0844c43b05d057b06c92002f227bac18e5 [diff] | |
| parent | f364fccff48477724a4589547266ef3345735bd8 [diff] |
resolved conflicts for merge of f364fccf to jb-dev-plus-aosp Change-Id: If2913010a98e7c0d1cb3a9efc3389b50d4079532