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