| commit | c1172c51af9734ce03c0495c3a0a658590f51487 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 01 13:51:37 2017 -0700 |
| committer | Xin Li <delphij@google.com> | Tue Aug 01 13:52:07 2017 -0700 |
| tree | 00b92db32310df457681b885b6b46f891687869d | |
| parent | a25a462f02bfbb7c83c6842d219a52783fe271d5 [diff] | |
| parent | 3bf771df3dc4bdb3d71c7ca3cc5aa3fdca8a4797 [diff] |
DO NOT MERGE: Merge commit '3bf771df3dc4bdb3d71c7ca3cc5aa3fdca8a4797' from oc-support-26.0-dev to stage-aosp-master. Bug: 64219148 Test: build Change-Id: I4db03ec695b0f4da398a16f76227890665060848