| commit | 1f35c6d91be03c611f6bb9622b50c3100815a450 | [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 | dc91745777ae81cbe471f41864d2943289b670dd | |
| parent | 5ed239217420be756d0ad06304f4bb14a23ab5ea [diff] | |
| parent | 5c7eff7b946f814392653e78842e7b07de8e3eae [diff] |
Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40 Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99