| commit | bd4e0384334f0d185edd5161fad89f662dd9b60c | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 09:33:28 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Wed Sep 16 09:33:28 2015 -0700 |
| tree | 9e1bad197e37b17be160e44eb57c9e2059e064e1 | |
| parent | 0bd6407666aa4d7b0a031900b4bb1c9103eb9bc5 [diff] | |
| parent | c82fcdda59031a3886863be2622994819d80ba25 [diff] |
resolved conflicts for c82fcdda to stage-aosp-master Change-Id: Icd3053becb307835f925d14bf7d1db91c3652562