| commit | 23c69591372863b9e0166768d37ef0915c38977e | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Nov 18 07:07:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Nov 18 07:07:06 2017 +0000 |
| tree | 750b180b6de65bb672f72f1e11e1970c846698a8 | |
| parent | 82cfaeddbec2242b6efb8f221a641acaa03870ae [diff] | |
| parent | 2cab5993881897057b951f4381df52261f4222f7 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' am: 2cab599388 Change-Id: Ia9a92e062db3511c0539cd19256aed4fe7cf239b