| commit | d8330aa69a54ebdaed1a4266ea1fa2ad06140011 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 28 19:15:17 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 28 19:15:17 2012 -0700 |
| tree | 1e44b23b8970b145003a27f43cd3396cddecc9b8 | |
| parent | d0c2c3bdc19066142cad2a4ed567bfc4378f38e2 [diff] | |
| parent | afbed3251303258c62e96728201822fadb8df6b2 [diff] |
resolved conflicts for merge of afbed325 to jb-mr1-dev Change-Id: Ibd276036f1e153598a79ac877a37298f53f6176f