commit | 09f48ef2c258cb0ee34d0783a31d74dc0a31dfb6 | [log] [tgz] |
---|---|---|
author | George Mount <mount@google.com> | Wed May 04 17:14:45 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 04 17:14:45 2016 +0000 |
tree | 2bc892a9e1d925f8482ba1aa1ffc5a25ef2cd1c6 | |
parent | aa5133d08e2d96440c3fc116f52f4c1db5acd28c [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: I9ef16ae1f9c1e35d995fe2facc8c8e21b143f0aa