| commit | 516274249fa2f94c36e93eef650220ad67b75d2f | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Fri Feb 10 15:53:27 2017 -0800 |
| committer | Jesse Hall <jessehall@google.com> | Fri Feb 10 17:15:15 2017 -0800 |
| tree | a955baed59cebfddf5e50853664e89b5c794dd98 | |
| parent | 6c1238699b4233bf515dd8023ff339eb86a20b5f [diff] | |
| parent | b3a1417663d64fe003b03c97e2f24b6eeba3f9dc [diff] |
resolve merge conflicts of b3a1417663d6 to nyc-mr2-dev-plus-aosp Test: mmma frameworks/base Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c