| commit | 4e321745173de1eb89343238fadfbcc7ba1a88f9 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Thu Sep 24 14:34:06 2015 -0700 |
| committer | Todd Kennedy <toddke@google.com> | Thu Sep 24 14:34:06 2015 -0700 |
| tree | ffc1d36568d5cf21647601d3f31a5ae499a44767 | |
| parent | 75ab8c7789b4ec5e26bc7d2f773a6c39d39a821b [diff] | |
| parent | cafacef60e49bbb8f6d829d261b46c5e7d119577 [diff] |
resolved conflicts for cafacef6 to stage-aosp-master Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9