| commit | 724e51e88dea60401102d00ecf87b63f565e09bf | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Apr 21 00:42:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 21 00:42:05 2016 +0000 |
| tree | ce133fda053a45fa0971d0990d85b9afe10c293b | |
| parent | 1b1b84e96a30b30d1df11948eccdf3bb0a821233 [diff] | |
| parent | 3e906a925c05824546c48776836a6f727271f625 [diff] |
resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp am: 3e906a925c * commit '3e906a925c05824546c48776836a6f727271f625': Change-Id: I9dce3069f215363b02c42d569e559cdf20998ddb