| commit | 54a5468b009c0976369379b4e4c5889f6528b5e8 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Thu Apr 21 15:38:48 2016 -0700 |
| committer | Jae Seo <jaeseo@google.com> | Thu Apr 21 15:38:48 2016 -0700 |
| tree | b8534c93313f7ee33a149752a7ac87486835baa0 | |
| parent | 6496281750e30f33de9b597ba29bcec6842a5e69 [diff] | |
| parent | 5737679c930b132dd5f98b82ce2f209cc6b368c8 [diff] |
resolve merge conflicts of 8fb40bb to nyc-dev-plus-aosp Change-Id: Ie6ad6680b76abfb882189853a2e43213b76162fd