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