| commit | dd8ebf1e15ffa78785307698551357fe80ea3775 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:23:22 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:23:22 2014 -0700 |
| tree | 164d3fdc2fa10acd8dac0fc46956aad712ab07cc | |
| parent | 69bae78787a01b2fe4f2ba8e3c388c31f0989cb4 [diff] | |
| parent | 520f585bc6409b5c0024105a46b282245dad42e0 [diff] |
resolved conflicts for merge of 520f585b to jb-mr1.1-dev Change-Id: I3982d8cd6585e6d4a3a9cf5b1d78f01f0e4ced6b