commit | c403d711366c1c265ed83c8f7cdeb8744194c12e | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Thu May 18 22:38:30 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 18 22:38:30 2017 +0000 |
tree | 5a788e2b4c2ae5db7e8c5fcf466ce4fb1a44961c | |
parent | e688bf820a9b820b4ed2a97c40218f9355c65dab [diff] | |
parent | 9f944561dae17cb00f2cfd14009d683d9566d994 [diff] |
Reconcile oc-dev-plus-aosp with master am: 9f944561da -s ours Change-Id: I8584593edc4d2a511d4ec7ff7cfaf0f76fd505be