| commit | a3e8e9c6f33ecd57221b7fe0ab1bf9c5035351ed | [log] [tgz] |
|---|---|---|
| author | Alex Light <allight@google.com> | Wed Jun 29 15:43:45 2016 -0700 |
| committer | Alex Light <allight@google.com> | Wed Jun 29 15:43:54 2016 -0700 |
| tree | 1355e96d51267c03f9157da55fdd9ecf138a8a48 | |
| parent | 84341566343c68cbffe5aa27115b242c7a3059f1 [diff] | |
| parent | 3f7c34859e484be7ec710837fbdb9563c3f8d328 [diff] |
resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp Bug: 29278988 Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d