| commit | 9f8602644418ecfb1a5c9555792ceed285fa72bd | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Fri Sep 25 15:06:49 2015 -0700 |
| committer | Todd Kennedy <toddke@google.com> | Fri Sep 25 15:06:49 2015 -0700 |
| tree | 4805e035e00fae606dd4571e340b1d51a73739b1 | |
| parent | 4e321745173de1eb89343238fadfbcc7ba1a88f9 [diff] | |
| parent | 7de7e0b0dd61acba813dec3a07d29f1d62026470 [diff] |
resolved conflicts for 7de7e0b0 to stage-aosp-master Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30