commit | a44a523506eb9ee59f8ad0c30fe30522ceda5196 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jul 24 17:13:03 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 24 17:13:03 2017 +0000 |
tree | 6746fe1db5a29a72e77e1e92d392e3c02b76af4a | |
parent | 8fe0e5f2129d19c4a08d100ca0db10a2d38b9045 [diff] | |
parent | cec24e4a2ccb7f11bdaaa29115b3b7c806536ec4 [diff] |
Merge "Merge "Fix potential build break" into oc-dev am: 7740a78495 -s ours am: bb4c42ccb7 -s ours" into oc-dr1-dev-plus-aosp