| commit | a6e57a9647b98c4ff7dcce3986830218e9d4200a | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Aug 01 12:21:55 2017 -0700 |
| committer | sqian <shuoq@google.com> | Tue Aug 01 12:25:53 2017 -0700 |
| tree | 6b294c925f94e3f570e2d77a41ccbdfdbfcc1f1e | |
| parent | ec37054b9e369f06adb34124c1465d480c8fdc3d [diff] | |
| parent | 345a396c18e61ba587bdafb15fdafbe27e0f3c82 [diff] |
resolve merge conflicts of 345a396c to oc-dr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9 Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9