commit | 0599c79cf74648ae2e5d4c736420cace56ebdde6 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Nov 13 15:18:37 2017 -0800 |
committer | Xin Li <delphij@google.com> | Mon Nov 13 15:18:37 2017 -0800 |
tree | 3a8df1e12d4b61b0ba7b314d0bf34a7de210be91 | |
parent | cd2e1c1535700304fae776b70468fd3c912d12ab [diff] | |
parent | 937ede14d84c2093f831ff8adab96dca207ad742 [diff] |
Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764