commit | 3a21c6e9f63129a898448d7b0694aa56f1682b51 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Nov 14 12:12:57 2017 -0800 |
committer | Xin Li <delphij@google.com> | Tue Nov 14 13:19:45 2017 -0800 |
tree | f787c62896548efa42c030d3849afef9e62c3cc2 | |
parent | 6f36fb0656734fb7f1ae41dd75668fec2de57b9c [diff] | |
parent | f33d5cbef2953fc3c62be4b95f81ed955f16c520 [diff] |
Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40 Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99