| commit | f6edb97b62a89789f7eea5ca4b31f697333c88cc | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon May 19 13:35:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 19 13:35:57 2014 +0000 |
| tree | 8cdd0e61eaa3668117fc8363fa4620b7456d315e | |
| parent | f8771ebc88c0990b9e1fb67ff84497ad782e87e4 [diff] | |
| parent | 9672ee125d6aee73bf1e5425c4089285714f25bf [diff] |
am 9672ee12: am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs." * commit '9672ee125d6aee73bf1e5425c4089285714f25bf': Fail if we're unable to agree on an ISA for shared UIDs.