| commit | 2306e0861f129c9ada6846ace9c82e37236bcf72 | [log] [tgz] |
|---|---|---|
| author | Dan Shi <dshi@google.com> | Fri Mar 31 16:18:57 2017 -0700 |
| committer | Dan Shi <dshi@google.com> | Fri Mar 31 16:21:01 2017 -0700 |
| tree | a39a561c423a7bc769627739dbd8339ae61e19b8 | |
| parent | afc85d4a628fb7cd7ad1e558661908913d362d56 [diff] | |
| parent | b20e736889bbbd5921ab83b7cf63d6907ba8ad0a [diff] |
resolve merge conflicts of b20e736 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I356f4e2adcf2d0b72e47b43ce6965184d2f57470