| commit | 2fdebc7a65b63ccb996c076cb33b27e563fca850 | [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 | 9692e3a3c883a00f33b46ff8bfc79ca701945938 | |
| parent | 4347d8540f479ba65af252f684337015d7577782 [diff] | |
| parent | 8fb40bb4ef7b581b277e6c6ceee57eae558f28c9 [diff] |
resolve merge conflicts of 8fb40bb to nyc-dev-plus-aosp Change-Id: Ie6ad6680b76abfb882189853a2e43213b76162fd