commit | 9f944561dae17cb00f2cfd14009d683d9566d994 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Thu May 18 15:24:29 2017 -0700 |
committer | Colin Cross <ccross@android.com> | Thu May 18 15:24:29 2017 -0700 |
tree | 0670110e954573776a1f095eb6fcc664a3bcd99f | |
parent | 27808e6a106262ef02200672db597473680e109a [diff] |
Reconcile oc-dev-plus-aosp with master Update oc-dev-plus-aosp with the changes between If935ce5cc04da7801210acb49f0a9ed15fcf5889 and Ia98501a471ef5f090446c9fbe2dd1d3422021a6f. Change-Id: I3f613064b7406bad98644de9c1a9833cf4af324a Merged-In: Ia98501a471ef5f090446c9fbe2dd1d3422021a6f