| commit | 8a0157227242eeb7917f064e0d81014bcda6d8f7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 07 13:19:20 2013 -0800 |
| committer | Elliott Hughes <enh@google.com> | Thu Mar 07 13:19:20 2013 -0800 |
| tree | 55f5531730a72309d1f84bf35b324804b342813a | |
| parent | 0a2ee4750ac4e9e5949dbf97fbad68065e83b632 [diff] | |
| parent | 4706606c884cae1bcf73a273580f85bb29255678 [diff] |
resolved conflicts for merge of 4706606c to jb-mr2-dev Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c