commit | 0b7c8816e38febdd58b61a3dc38660881015fedd | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Aug 02 19:21:26 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 19:21:26 2017 +0000 |
tree | bd72dadd0d84546612d1218e206d30366fafd20d | |
parent | 5d2356d04923b67892464365c575ee34e350c08b [diff] | |
parent | b6d89b180c52379aa0bc3391c76093aa2a9e9b38 [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 am: bfc1832985 -s ours am: b6d89b180c -s ours Change-Id: I840c56f3a1d0e4a78dbdbeffb38cbc6c2e92598e