| commit | 6458c80c006ad5124e534ddc6d4de42811e7fb31 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 15:00:58 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 15:00:58 2014 -0700 |
| tree | cd17d5ab157e51abeb4f28dd29c7126a05032305 | |
| parent | 28b127ec1e5af575a74af679a8542042112d177e [diff] | |
| parent | 3baef70ca5413b24cd8cf9cb300113b99b7c975a [diff] |
resolved conflicts for merge of 3baef70c to jb-mr1-dev Change-Id: I93a460f4ba7c9e2d8e417c53061072773f9ef9fd