| commit | 2164d895f9ae077ce2d53ccdcc213c3483f3b9bd | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 10 10:17:13 2014 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Fri Oct 10 10:17:13 2014 +0100 |
| tree | d3bf3e237b5d652f6c62a6a891f2921be2857b20 | |
| parent | d6aa6177c90a84620e79b65009129c985b1913d4 [diff] | |
| parent | 865c83f8383f03d545217c35d9140a4627a74406 [diff] |
resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp Change-Id: I552e60c4cc00bf422aad5ba3939ed50eaef11e56