| commit | 488f2e896bdb0b639a8b4f29a1a23e343d78ebe2 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Thu Apr 21 10:46:07 2016 -0700 |
| committer | Jae Seo <jaeseo@google.com> | Thu Apr 21 10:46:07 2016 -0700 |
| tree | 343ad03acc71048c46c1e6ea1c438f402d7cdaf7 | |
| parent | 751b79212231db61c0efca37201fbca067306021 [diff] | |
| parent | 7966cf7405ee81a83c407fbef54dc38d906face8 [diff] |
resolve merge conflicts of 7966cf7 to nyc-dev-plus-aosp Change-Id: I44e0c5ee194d1fe60ff53ea2cc5477283b342821