| commit | 98e9da10bdf72e9bdda6edf8815ecf7007f0561c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 02 03:36:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 03:36:31 2017 +0000 |
| tree | 1ed8a1c813b7950106df8e7d83ae4ee8eaeb1f7e | |
| parent | a25a462f02bfbb7c83c6842d219a52783fe271d5 [diff] | |
| parent | c1172c51af9734ce03c0495c3a0a658590f51487 [diff] |
DO NOT MERGE: Merge commit '3bf771df3dc4bdb3d71c7ca3cc5aa3fdca8a4797' from oc-support-26.0-dev to stage-aosp-master. am: c1172c51af -s ours Change-Id: I0e3f81832d855e95727c71f034b72643d19bb9ae