| commit | 97fae9f53a22d85794ac94aafecce33dceb3ec4e | [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 | fca737e3be4c991db34ddcafb320e4a67a930e17 [diff] | |
| parent | c3f53c0ec9435b2e7b1cb63ba49d485fb92c80af [diff] |
resolve merge conflicts of 40eff95 to stage-aosp-master Change-Id: I91935ba9603ffd41af2009adc13a024701619c52