| commit | 153811d74a1f16986d6b33189814cb7828fab9f9 | [log] [tgz] |
|---|---|---|
| author | Pavlin Radoslavov <pavlin@google.com> | Tue May 24 18:36:00 2016 -0700 |
| committer | Pavlin Radoslavov <pavlin@google.com> | Tue May 24 18:36:00 2016 -0700 |
| tree | 7770aa03d27482e06016574ef2c7836afa7dc415 | |
| parent | 564621ecb25a5817f84d338a6fd5e3e2b0a31c7d [diff] | |
| parent | e1a60983dacd4f454a128ccb9774ca0bf92c724a [diff] |
resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp Change-Id: I216125254d09cf00a60274f510f814ee8f1a31ba