| commit | 088849fc5e6e03d7b5572aeafd5edd8087efc679 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri Aug 03 08:07:01 2018 -0700 |
| committer | Makoto Onuki <omakoto@google.com> | Fri Aug 03 08:07:01 2018 -0700 |
| tree | e962797377d470f0895964652dba0ca330b1b3fe | |
| parent | 38a6375f99a3f813db48012353355b9685bda007 [diff] | |
| parent | c02b2ec3f179820c31c470d89b919ce721513472 [diff] |
resolve merge conflicts of c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Iabf4bf87cc8aec5dab871096fe320098c4622545