| commit | 0b8e889424e422363f3c872e48757cff775a4b9a | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Mon Jan 23 21:49:40 2017 +0900 |
| committer | Erik Kline <ek@google.com> | Mon Jan 23 21:49:40 2017 +0900 |
| tree | e7e28eb571d44fdc05148c70a979a897eaf72d02 | |
| parent | 767b7ad7dc6159e187730d90ed12501ca0a4f8eb [diff] | |
| parent | 261932b98cb622f12af08c2f562e96a30c96e75f [diff] |
resolve merge conflicts of 261932b98cb6 to nyc-mr2-dev-plus-aosp Change-Id: I8476804f77567cf01693a4126d5a41bcdb0016e8