| commit | c9ea793119ed472b19f8fcef1755b5fff3e73d27 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Aug 27 17:51:39 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 27 17:51:39 2015 +0000 |
| tree | ff57db26c2fea8cda4ab9ebbdebcc470485326c5 | |
| parent | d9f2167559628781beaa712f7906d61baf41c9b1 [diff] | |
| parent | fbeb2aade78d51fb850d0eb62f777b77e5b2a6b7 [diff] |
resolved conflicts for merge of 71e0dd32 to mnc-dev-plus-aosp automerge: fbeb2aa -s ours * commit 'fbeb2aade78d51fb850d0eb62f777b77e5b2a6b7':