| commit | 526ec7d6c496719b3ae7a37676323464ef22439c | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@google.com> | Mon Nov 26 14:12:30 2012 -0800 |
| committer | Brett Chabot <brettchabot@google.com> | Mon Nov 26 14:12:30 2012 -0800 |
| tree | afb1a8ebe73639cdd3d4be4ba303e04e7fa0f0d8 | |
| parent | ab997d9e46fa3c9ecc74dc0103afb5f4310f4a8c [diff] | |
| parent | b1092aea05acd4bebe671cbd6fd2ea39df0898cb [diff] |
resolved conflicts for merge of b1092aea to jb-mr1-dev Change-Id: I0eb1f731b77049d32569b5e753fefa4900c0c088