tree 6746fe1db5a29a72e77e1e92d392e3c02b76af4a
parent 8fe0e5f2129d19c4a08d100ca0db10a2d38b9045
parent cec24e4a2ccb7f11bdaaa29115b3b7c806536ec4
author Android Build Merger (Role) <android-build-merger@google.com> 1500916383 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500916383 +0000

Merge "Merge "Fix potential build break" into oc-dev am: 7740a78495  -s ours am: bb4c42ccb7  -s ours" into oc-dr1-dev-plus-aosp