| commit | b6d89b180c52379aa0bc3391c76093aa2a9e9b38 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 01 18:58:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 18:58:07 2017 +0000 |
| tree | 73ea2305a6b0af6c9252b401037587b20ccee3f0 | |
| parent | 1d0f2b3a492bfe7867499121c5d375eb677c6d28 [diff] | |
| parent | bfc1832985d3ec1df487f0f79529dc37063532c3 [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 Change-Id: I04956b727fced457ed28244fa246b7d80d6a22d2