| commit | b558910bbe33f7fcbf7ff4ed87b3f6877a1f39ea | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Tue Nov 04 17:22:40 2014 -0800 |
| committer | Ian Rogers <irogers@google.com> | Tue Nov 04 17:22:40 2014 -0800 |
| tree | 570437116827b9a73682c5b26b2de30527cbf640 | |
| parent | d24922c15892effa7acda6dca4787c6335936898 [diff] | |
| parent | f9a3c05f9ed2a8e0b4257f9fd1695cef2a6124b9 [diff] |
resolved conflicts for merge of f9a3c05f to stage-aosp-master Change-Id: Ib0aa6f13c3ad651fa1d0dd551106c497697f64b7