| commit | 712676772b0d6e32bdce3430eed0a4d9771aac7e | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Apr 03 14:19:26 2013 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed Apr 03 14:19:26 2013 -0700 |
| tree | 2782086c81b38d7cb29f49c130bbead8e0c8bb8f | |
| parent | fe15b4dad3538fbcbdea3a09243a5f25d3718b3e [diff] | |
| parent | 5ec66d15428e595934c9f0d9e26ea2234d545dbd [diff] |
resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3