| commit | 0d495d4e03f30402e053b144323a806178865c51 | [log] [tgz] |
|---|---|---|
| author | Patrick Tjin <pattjin@google.com> | Thu Oct 13 16:40:51 2016 -0700 |
| committer | Patrick Tjin <pattjin@google.com> | Thu Oct 13 16:40:51 2016 -0700 |
| tree | d822476b5baf24202bf9cd15ad881f324980b933 | |
| parent | e45490f77826eee306c9e56374fbd5856e8dae1b [diff] | |
| parent | 2f75d53ef0f36faf88fc38fe8ccfc8877869708e [diff] |
resolve merge conflicts of 2f75d53 to nyc-mr1-dev-plus-aosp Change-Id: I813c569a1dd2b35943d2e829875b80c3013ea2fb