| commit | a232a68d4ccf2960350adff6af99a52bde2b021d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 14:41:02 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 14:41:02 2014 -0700 |
| tree | 0426f2e5c60e22976a032f1a7c9ae47c202dc76e | |
| parent | 9c48ab82084828087c47086f2379b4927ec057e2 [diff] | |
| parent | 5476cfee6b8b5e17a7fa72bb141ca95ef913a4f5 [diff] |
resolved conflicts for merge of 5476cfee to jb-mr1-dev Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4