| commit | 8782a12005e90bbd49be579fb8ede3a42a007380 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 12:43:01 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 12:43:01 2014 -0700 |
| tree | 42b880c0495e6354dea79b8905f37c5814b993d3 | |
| parent | 5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e [diff] | |
| parent | 61fb5784322fce5198e74834c32c8d8c547a8adf [diff] |
resolved conflicts for merge of 61fb5784 to jb-mr1-dev Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d