| commit | eaddde6888b1f58d70b338ad7725214781014324 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jun 15 22:28:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 22:28:05 2016 +0000 |
| tree | 95df40add23e127030abe0cb224c606659a33932 | |
| parent | 2fc7cd69fd93df4bf2fb415acfd04cb02e905830 [diff] | |
| parent | 274d17dc0fa3d4c5c4271150c1acee271144b1f1 [diff] |
resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f Change-Id: I356adf332d5749a6d3f3e29b99bf3fca35de349a