commit | e8101c02f8df22460b9d6fc15ed76e518a904ea8 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Oct 18 23:27:31 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 18 23:27:31 2017 +0000 |
tree | fadc48362e0d83d58c354f773b964b24526f5c40 | |
parent | 2e21af44913c729166448bdfc90e9030dfb16bb3 [diff] | |
parent | c72535816cb89b251a68f4b53d7686c3ed0d0bdf [diff] |
Merge "Merge "DO NOT MERGE initial add sts to build" into nyc-dev am: b20486d397 am: 41a57745a4 am: 5a37ad8d6b am: cf5f702e19 am: 5da13164a3 -s ours am: 83c569775c am: 49505afe45 am: 17abc3a4e4" into oc-mr1-dev-plus-aosp