| commit | 278574fc45986ae59d09df464b7db9873808d49d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 11 13:59:03 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Jul 11 13:59:03 2016 -0700 |
| tree | 4c09bec90d8a807064fd476b7504a3adc795e8a8 | |
| parent | 082cfc0099ded557ec8a3292f6363d40615d5391 [diff] | |
| parent | 6590b9da75b00b4f8d7053d07a1b8c71a5d1a7ea [diff] |
resolve merge conflicts of 743b0c5 to stage-aosp-master Change-Id: I17c32128b1c376927319183fa78eb60044a7d0b5