| commit | c4e7d852f59fda2ec95e7658c4ddd56d7d9ad6e1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 02 13:22:49 2017 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Nov 02 13:22:49 2017 -0700 |
| tree | 1382a6da9298f8a168bf49b9117b2a4eb78f2c69 | |
| parent | c6b9ebb7c9398f83b4db85f7a59d31b28e911ddc [diff] | |
| parent | 6d0253779d72fd2f5d16ac1e6e52f6b4c0535ff4 [diff] |
Merge commit '6d0253779d72fd2f5d16ac1e6e52f6b4c0535ff4' from oc-mr1-dev-plus-aosp into stage-aosp-master. Change-Id: Ibf8218f79166a70b942691cf00683c7e66b99576