| commit | ee144b1e60a88e8f097113e046813f0b61c38b9b | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Oct 02 17:34:05 2015 -0700 |
| committer | Stephen Hines <srhines@google.com> | Fri Oct 02 17:34:05 2015 -0700 |
| tree | 0d9fd819c4ac355e3228473fde24b4abc3f24e5f | |
| parent | 5fbb245230317b5ca312556b73380195871827eb [diff] | |
| parent | bd57dac5d5b99d7f6bead50f327b488d464521df [diff] |
resolved conflicts for bd57dac5 to stage-aosp-master Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85