| commit | 3b38eaa3c2ad33c81be46ba5d685260295447791 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Wed Aug 09 00:45:34 2017 -0700 |
| committer | Jakub Pawlowski <jpawlowski@google.com> | Wed Aug 09 13:03:35 2017 +0000 |
| tree | 06b9e0a2d2bb15566e064e85a033e1a929a537d2 | |
| parent | 825345628c873539983b4ee27f0446a2e8530401 [diff] |
resolve merge conflicts of 15658662fdde to stage-aosp-master Test: this fixes merge conflict that I skipped Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08