| commit | d03d627164396715524605478f698d93bb575361 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Apr 26 19:36:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 26 19:36:17 2017 +0000 |
| tree | 504a7b355ad58c932b91258e57e7863df4582a9e | |
| parent | 9e83fbfd145933d542db91cf94363089d28936b6 [diff] | |
| parent | 8afbe27f81d35686e40e4e6d76af0c9118782754 [diff] |
resolve merge conflicts of 7a78e14ec to oc-dev-plus-aosp am: 8afbe27f81 -s ours Change-Id: Ie529392ce562177cb0d4d841fa2bdf2d54f51e26