| commit | 1cc4f4ec49f99352498007b67a75fefa0f57e494 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 21:04:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 21:04:07 2017 +0000 |
| tree | e6ec0d72c260974a8a712d3cdf8d242645fb73c7 | |
| parent | 6a9ca09693d66ba68f045f199df75b7141dc2f7b [diff] | |
| parent | e15c52f95e09391629d4046a1ceb296ae29710cd [diff] |
DO NOT MERGE: Merge commit '2f6f6abe4d05282c82dd56fa897949f49ac3cd6c' from oc-support-26.0-dev to stage-aosp-master. am: e15c52f95e -s ours Change-Id: I2c2ed41f19c05514a2aa0276fa7ebf37f06d4643