commit | d82e4add2a252583c0c8e799901eaa6f8dd9368e | [log] [tgz] |
---|---|---|
author | Julia Reynolds <juliacr@google.com> | Thu Aug 17 16:01:30 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 17 16:01:30 2017 +0000 |
tree | 1c0efa8fc81b490c2347e8c02d575736ae24aa12 | |
parent | bb143bafe20a349fb94421273dfc6bcfffd675e6 [diff] | |
parent | 54ff7e7582b374b7e940b560f3fdda512dfd7ebb [diff] |
Merge changes I36636687,I4c45f787 into oc-mr1-dev am: 54ff7e7582 Change-Id: I6f368c79acfc92c4ed62e7808ae5c744959069c7