| commit | 559cc01e3e2c6c5ed1cb2a0ca003ff48b5d0f41d | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Mon Aug 22 20:13:52 2016 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Mon Aug 22 20:13:52 2016 -0700 |
| tree | 14c845d2dea2a9a1db36ba4d4bc66bb09fb4a1d7 | |
| parent | 33f8c194f9379ffa444c3c44d23e70f80fef5e5b [diff] | |
| parent | 40eff9534e656d67662a30b274b410f4b6294818 [diff] |
resolve merge conflicts of 40eff95 to stage-aosp-master Change-Id: I91935ba9603ffd41af2009adc13a024701619c52