| commit | b97d792bdee1966da96e0c82a292bc0592f6e18b | [log] [tgz] |
|---|---|---|
| author | Patrick Tjin <pattjin@google.com> | Thu Oct 13 16:39:24 2016 -0700 |
| committer | Patrick Tjin <pattjin@google.com> | Thu Oct 13 16:39:24 2016 -0700 |
| tree | 7fb40cb5f802430aa6065ccc1df38042734ed180 | |
| parent | ecad8adfeec18d1ee361329cc94cbc320e499fec [diff] | |
| parent | 4c3239a3f0e0f84e1c00b6e9438da74565ed0b9f [diff] |
resolve merge conflicts of 4c3239a to nyc-mr1-dev-plus-aosp Change-Id: Ib50749f37ba557e15b222b63898a21e43de71633