| commit | 3e906a925c05824546c48776836a6f727271f625 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Wed Apr 20 17:20:53 2016 -0700 |
| committer | Hyunyoung Song <hyunyoungs@google.com> | Wed Apr 20 17:20:53 2016 -0700 |
| tree | ce133fda053a45fa0971d0990d85b9afe10c293b | |
| parent | 3655a7dd98033b0f13baeca0346c7b03f2c0c81e [diff] | |
| parent | 7520e492e75a517b7ff41452318dd56bb9a74c8c [diff] |
resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp Change-Id: I7e619acb70767f5db5004a40e160ef6487aea78b