| commit | 673d9734c2d9b62ecd41dcac3c730d242952989e | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:17:09 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:17:09 2014 -0700 |
| tree | cb66515360ae3ed3708868c2148cac7df6908d2b | |
| parent | 5280c911d81a7db5ec8854850bef60d8b0951358 [diff] | |
| parent | 00d096490189dadfc5e2a1e129d8b524d90da247 [diff] |
resolved conflicts for merge of 00d09649 to jb-mr1-dev Change-Id: Ib3c34a1989d4251c3ac4755c52fe05a81644930a