commit | bfc1832985d3ec1df487f0f79529dc37063532c3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 01 18:54:36 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 18:54:36 2017 +0000 |
tree | 93453aace51409ec982d805d1063d6c5d58070b5 | |
parent | b972321361fdd5d7cc5ee9d92b610c3aeaef6a8c [diff] | |
parent | 3b9144a101b9a8f58ed94ee928317f2f85677a0c [diff] |
DO NOT MERGE: Merge commit 'b972321361fdd5d7cc5ee9d92b610c3aeaef6a8c' from oc-support-26.0-dev to stage-aosp-master. am: cc3da80ac4 -s ours am: 3b9144a101 -s ours Change-Id: Iebb53cecf53ac05745fc056f2ec6077d8fc03428