| commit | b9156758fa9c26791f317f0080be0403f9d03d16 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 15 01:27:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 15 01:27:47 2017 +0000 |
| tree | 97c0eb149d6a320c413ae165237a2e77d18d4d46 | |
| parent | fd0011a9bbcff2a77c7bee2c7d19705a3a097784 [diff] | |
| parent | 44dd4881defd4589fad6fdd8596d6bc6f3f9dfb5 [diff] |
Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. am: 44dd4881de -s ours Change-Id: Iee04f4f8cec1570edffb2fe69400c5d494903af2