commit | b167d69629a571ef313688c02dfd0d7ddace8eb4 | [log] [tgz] |
---|---|---|
author | Pirama Arumuga Nainar <pirama@google.com> | Wed Oct 26 17:35:50 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 26 17:35:52 2016 +0000 |
tree | 96065537ae52025d8bdf72941c0ae7440d804651 | |
parent | d27d7495bf70da4faffda3d8083396e0e07f2931 [diff] | |
parent | 77f300250d1e8e20e4f460f40c6f7d051bdf6e6d [diff] |
Merge changes from topic 'rs-rebase-275480' * changes: Re-apply local patch dropped during 'git merge' Incremental squash-merge of aosp/dev to aosp/master Update aosp/master Clang for rebase to r275480