| commit | 5d795e95b72a7c76624000de378bcb343c12c4c9 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Sun Jul 24 23:28:21 2016 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Sun Jul 24 23:28:21 2016 -0700 |
| tree | 15fc2a12699198c7846f158e9c20ee1f66078936 | |
| parent | bc083616e740a4dd9b3a99b4b25b3de0d365a4ef [diff] | |
| parent | 528378d435602d58d6adf7e8ed41f07b190bfbbb [diff] |
resolve merge conflicts of 528378d to nyc-mr1-dev-plus-aosp Change-Id: Ia3a5b2237a11c47c512329c2f62cb8661d576852