| commit | d6c4d47cf13c52e06e5e75be6e865dfd36441792 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Apr 30 10:27:39 2014 -0700 |
| committer | Nicholas Sauer <nicksauer@google.com> | Wed Apr 30 10:27:39 2014 -0700 |
| tree | c5b6447d389b6d769b891dd64af4b091ea0afc41 | |
| parent | c161d679cb418dc99a789c7f682fa476a034afb2 [diff] | |
| parent | 473b3ecf68e3792af771efa3a15ac36716db0cde [diff] |
resolved conflicts for merge of 473b3ecf to jb-mr1-dev Change-Id: I4734e7f83d7c1221f600646758524ad28f0d3e89