commit | 1fd5ba4e6eddb757a8dd36c733c78b2d22d5fb4f | [log] [tgz] |
---|---|---|
author | George Mount <mount@google.com> | Wed May 04 17:14:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 04 17:14:46 2016 +0000 |
tree | 28489bbae23295427585f508fd022898a057a0f2 | |
parent | ed37f9f49de2863768e1bcfa649f9f6671d0d354 [diff] | |
parent | 3926317ec54b5a0cc8e1587067295e3b4d5c9d16 [diff] |
DO NOT MERGE ANYWHERE Revert "Revert "Ensure that ..."" am: b10a890a92 -s ours am: 3926317ec5 -s ours * commit '3926317ec54b5a0cc8e1587067295e3b4d5c9d16': DO NOT MERGE ANYWHERE Revert "Revert "Ensure that ..."" Change-Id: I1bc4f06b4ebc81d853b1960a204c64a610a3f203