commit | 32e9f4a70f7dfe6e8b60dab081ea93aca7171a61 | [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 | cc76a40025c2189fc70dd6edd4a0eba251fd7b44 | |
parent | 87a8b4b7607788a2a214c9967f1baaa669a35cb5 [diff] | |
parent | ec946e8a2151fa379c3a731b96866cde0c31dfbe [diff] |
Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40 Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99